Fix documentation directory and eliminate special handling in spec file.

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

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index bade12a..b66d556 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
@@ -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" \
@@ -148,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
@@ -170,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