From f4acf795dc25b36aaefa30ea2e61b898cb5f8013 Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Wed, 19 Sep 2007 05:09:23 +0000
Subject: [PATCH] Fix documentation directory and eliminate special handling in
 spec file.

---
 bootstrap          |  4 ++--
 doc/Makefile.am    |  2 +-
 shibboleth.spec.in | 10 ++++------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/bootstrap b/bootstrap
index 59d96ed..1e4d21e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -13,11 +13,11 @@ find_program()
 }
 
 # Find appropriate versions of the auto tools
-find_program aclocal 1.7
+find_program aclocal 1.9
 aclocal="$program"
 find_program autoheader 2.53
 autoheader="$program"
-find_program automake 1.7
+find_program automake 1.9
 automake="$program"
 find_program autoconf 2.53
 autoconf="$program"
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 07a9ec6..2efec71 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 
-pkgdocdir = $(prefix)/doc/@PACKAGE@
+pkgdocdir = $(datadir)/doc/@PACKAGE@
 
 docfiles = \
 	CREDITS.txt \
diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index bade12a..b66d556 100644
--- 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
-- 
2.1.4