https://issues.shibboleth.net/jira/browse/SSPCPP-86

[shibboleth/cpp-sp.git] / shibboleth.spec.in

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index d12186f..ea24e92 100644 (file)
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -1,19 +1,20 @@
 Name:          shibboleth
 Summary:       Open source system to enable inter-institutional resource sharing
 Version:       @-VERSION-@
-Release:       1
+Release:       2
 Group:         System Environment/Libraries
-Vendor:     Internet2
-License:    Apache 2.0
+Vendor:                Internet2
+License:       Apache 2.0
 URL:           http://shibboleth.internet2.edu/
-Source0:       http://shibboleth.internet2.edu/downloads/%{name}-%{version}.tar.gz
+Source0:       %{name}-%{version}.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: openssl-devel, curl-devel >= 7.10.6
-BuildRequires: xerces%{?xercesver}-c-devel >= 2.8.0, xml-security-c-devel >= 1.1.0
+BuildRequires: xerces%{?xercesver}-c-devel >= 2.8.0, xml-security-c-devel >= 1.3.0
 BuildRequires: zlib-devel, opensaml-devel >= 1.1.1, opensaml-devel < 2.0
-%{?_with_log4cpp:BuildRequires: log4cpp-devel >= 0.3.5}
+%{?_with_log4cpp:BuildRequires: log4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: log4shib-devel}
+%{?_with_fastcgi:BuildRequires: fcgi-devel}
 %if "%{_vendor}" == "redhat"
 %{!?_without_builtinapache:BuildRequires: httpd-devel}
 %endif
@@ -23,44 +24,36 @@ BuildRequires:      zlib-devel, opensaml-devel >= 1.1.1, opensaml-devel < 2.0
 
 
 %description
-Shibboleth, a project of Internet2/MACE, is developing architectures,
-policy structures, practical technologies, and an open source
-implementation to support inter-institutional sharing of web resources
-subject to access controls. In addition, Shibboleth will develop a
-policy framework that will allow inter-operation within the higher
-education community.
+Shibboleth, a project of Internet2/MACE, is is an open source,
+attribute-based, cross-domain web single sign-on package, primarily
+based on the SAML standard.
 
-This package contains the shibboleth runtime library and apache module.
+This package contains the Shibboleth runtime libraries and Apache
+server module.
 
 %package devel
-Summary: Shibboleth development Headers
+Summary: Shibboleth development files
 Group: Development/Libraries
 Requires: %{name} = %{version}
 
 %description devel
-Shibboleth, a project of Internet2/MACE, is developing architectures,
-policy structures, practical technologies, and an open source
-implementation to support inter-institutional sharing of web resources
-subject to access controls. In addition, Shibboleth will develop a
-policy framework that will allow inter-operation within the higher
-education community.
+Shibboleth, a project of Internet2/MACE, is is an open source,
+attribute-based, cross-domain web single sign-on package, primarily
+based on the SAML standard.
 
 This package contains the headers and other necessary files to build
-applications that use the shibboleth library.
+extensions using the Shibboleth runtime libraries.
 
 %prep
 %setup -q
 
 %build
-%configure %{?shib_options}
+%configure %{?_with_fastcgi} %{?shib_options}
 %{__make}
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
-%{__rm} -rf _docs
-
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
-%{__mv} $RPM_BUILD_ROOT/usr/doc/shibboleth _docs
 
 %if "%{_vendor}" == "suse"
        %{__sed} -i "s/\/var\/log\/httpd/\/var\/log\/apache2/g" \
@@ -76,8 +69,9 @@ find $RPM_BUILD_ROOT/%{_libexecdir} -type f -or -type l |
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
 
-%ifnos solaris2.8 solaris2.9 solaris2.10 
-%post -p /sbin/ldconfig
+%post
+%ifnos solaris2.8 solaris2.9 solaris2.10
+/sbin/ldconfig
 %endif
 
 # Plug the SP into Apache on a recognized system.
@@ -118,15 +112,16 @@ fi
 %if "%{_vendor}" == "redhat"
        if [ -d %{_sysconfdir}/init.d ] ; then
                if [ ! -f %{_sysconfdir}/init.d/shibd ] ; then
-                       %{__cp} -p %{_sysconfdir}/shibboleth/%{_vendor} %{_sysconfdir}/init.d/shibd
+                       %{__cp} -p %{_sysconfdir}/shibboleth/shibd-%{_vendor} %{_sysconfdir}/init.d/shibd
                        %{__chmod} 755 %{_sysconfdir}/init.d/shibd
                        chkconfig --add shibd
                fi
        fi
 %endif
 
+%postun
 %ifnos solaris2.8 solaris2.9 solaris2.10 
-%postun -p /sbin/ldconfig
+/sbin/ldconfig
 %endif
 
 # delete the Apache configuration if we're being removed
@@ -145,8 +140,6 @@ fi
 
 %files -f rpm.filelist
 %defattr(-,root,root,-)
-%doc _docs/CREDITS.txt _docs/NOTICE.txt _docs/NEWS.txt _docs/logo.jpg
-%doc _docs/main.css _docs/README.txt _docs/LICENSE.txt
 %{_sbindir}/shibd
 %{_sbindir}/siterefresh
 %{_bindir}/shibtest
@@ -167,6 +160,8 @@ fi
 %{_sysconfdir}/%{name}/shibd-redhat
 %{_sysconfdir}/%{name}/shibd-debian
 %{_sysconfdir}/%{name}/shibd-osx.plist
+%docdir %{_datadir}/doc/shibboleth
+%{_datadir}/doc/shibboleth
 
 %exclude %{_bindir}/posttest
 %exclude %{_bindir}/test-client
@@ -179,8 +174,11 @@ fi
 %{_libdir}/libshib-target.so
 
 %changelog
+* Mon Dec 17 2007 Scott Cantor   <cantor.2@osu.edu>  - 1.3.1-2
+- 1.3.1 initial release
+
 * Sat Sep 15 2007 Scott Cantor   <cantor.2@osu.edu>  - 1.3.1-1
-- 1.3.1 release
+- 1.3.1 release candidate
 
 * Mon Oct 2 2006 Scott Cantor  <cantor.2@osu.edu>  - 1.3-11
 - Applied fix for secadv 20061002