Up log4cpp version requirement.

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

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index 816ed59..ec8afca 100644 (file)
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -3,8 +3,8 @@ Summary:        Open source system to enable inter-institutional resource sharing
 Version:       @-VERSION-@
 Release:       1
 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
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
@@ -12,7 +12,7 @@ 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: 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"
@@ -58,10 +58,8 @@ applications that use the shibboleth library.
 
 %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" \
@@ -77,8 +75,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.
@@ -119,15 +118,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
@@ -146,8 +146,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
@@ -168,6 +166,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