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

---
 bootstrap          | 4 ++--
 doc/Makefile.am    | 2 +-
 shibboleth.spec.in | 6 ++----
 3 files changed, 5 insertions(+), 7 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 b95ef27..4188e1d 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 ba2fc30..c37cc44 100644
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -57,9 +57,7 @@ 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/%{name} _docs
 
 %if "%{_vendor}" == "suse"
 	%{__sed} -i "s/\/var\/log\/httpd/\/var\/log\/apache2/g" \
@@ -147,8 +145,6 @@ fi
 
 %files -f rpm.filelist
 %defattr(-,root,root,-)
-%doc _docs/CREDITS.txt _docs/LICENSE.txt _docs/NOTICE.txt _docs/README.txt _docs/RELEASE.txt
-%doc _docs/logo.jpg _docs/main.css
 %{_sbindir}/shibd
 %{_bindir}/mdquery
 %{_bindir}/resolvertest
@@ -169,6 +165,8 @@ fi
 %{_sysconfdir}/%{name}/shibd-debian
 %{_sysconfdir}/%{name}/shibd-osx.plist
 %exclude %{_libexecdir}/*.la
+%docdir %{_datadir}/doc/%{name}
+%{_datadir}/doc/%{name}
 
 %files devel
 %defattr(-,root,root,-)
-- 
2.1.4