Working SPEC file for Shibboleth.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@1204 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/.cvsignore b/.cvsignore
index bbd69c0..d265afe 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -14,3 +14,4 @@ configure
 libtool
 *.opt
 *.ncb
+shibboleth.spec

diff --git a/Makefile.am b/Makefile.am
index c5983f1..46b65e8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ EXTRA_DIST = \
        schemas doc isapi_shib isapi_shib_gui \
        Shibboleth.dsw libtool.m4 acx_pthread.m4 acx_rpctest.m4 depcomp \
        config_win32.h posttest/posttest.dsp shibtest/shibtest.dsp \
-       shibboleth.spec.in
+       shibboleth.spec.in shibboleth.spec
 
 dist-hook:
        rm -rf `find $(distdir)/schemas -name CVS`
@@ -27,9 +27,9 @@ DIST_SUBDIRS = doc oncrpc shib schemas configs shib-target shar test \
 all-local: shibboleth.spec
 
 shibboleth.spec: shibboleth.spec.in Makefile
-        rm -f $@.tmp
-        sed < $< > $@.tmp \
-            -e 's:@-VERSION-@:${VERSION}:'
-        mv $@.tmp $@
+       rm -f $@.tmp
+       sed < $< > $@.tmp \
+           -e 's:@-VERSION-@:${VERSION}:'
+       mv $@.tmp $@
 
 DISTCLEANFILES = shibboleth.spec

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index c3210ab..3f685bd 100644 (file)
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -2,7 +2,7 @@ Name:           shibboleth
 Summary:       Open source system to enable inter-institutional resource sharing
 Version:       @-VERSION-@
 Release:       1
-Copyright:     University Corporation for Advanced Internet Development, Inc.
+#Copyright:    University Corporation for Advanced Internet Development, Inc.
 Group:         System Environment/Libraries
 License:       Apache style
 URL:           http://shibboleth.internet2.edu/
@@ -13,7 +13,6 @@ BuildRoot:    %{_tmppath}/%{name}-%{version}-root
 BuildRequires: openssl-devel, curl-devel >= 7.10.6, xerces-c-devel >= 2.6.1
 BuildRequires: xml-security-c-devel >= 1.1.0, log4cpp-devel >= 0.3.5
 BuildRequires: zlib-devel, opensaml-devel, httpd-devel
-%{?_with_mysql:BuildRequires: mysql-devel >= 4}
 
 %description
 Shibboleth, a project of Internet2/MACE, is developing architectures,
@@ -45,8 +44,7 @@ applications that use the shibboleth library.
 %setup -q
 
 %build
-%configure --enable-apache20 %{?_with_mysql:--enable-mysql} \
-       %{!?_with_mysql:--disable-mysql}
+%configure --enable-apache-20
 make
 
 %install
@@ -54,7 +52,10 @@ make
 rm -rf _docs
 
 make install DESTDIR=$RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT/doc/shibboleth _docs
+mv $RPM_BUILD_ROOT/usr/doc/shibboleth _docs
+
+find $RPM_BUILD_ROOT/%{_libexecdir} -type f -or -type l | grep \.so |
+  sed -e "s|$RPM_BUILD_ROOT||" | sort > rpm.filelist
 
 %check || :
 make check
@@ -68,25 +69,35 @@ make check
 %postun
 /sbin/ldconfig
 
-%files
+%files -f rpm.filelist
 %defattr(-,root,root,-)
-%doc _docs/LICENSE.txt _docs/NEWS.txt _docs/README.txt _docs/TODO.txt
+%doc _docs/CREDITS.txt _docs/InQueue.html _docs/NEWS.txt _docs/logo.jpg
+%doc _docs/DEPLOY-GUIDE-ORIGIN.html _docs/main.css _docs/README.txt
+%doc _docs/DEPLOY-GUIDE-TARGET.html _docs/LICENSE.txt _docs/mysql-4.0.12.diff
 %{_bindir}/shar
-%{_bindir}/site-refresh
+%{_bindir}/siterefresh
+%{_libdir}/libshib.so.*
+%{_libdir}/libshib-target.so.*
+%dir %{_sysconfdir}/shibboleth
+%{_sysconfdir}/shibboleth/*.xsd
+%config %{_sysconfdir}/shibboleth/*.xml
+%config %{_sysconfdir}/shibboleth/*.html
+%config %{_sysconfdir}/shibboleth/*.logger
+%config %{_sysconfdir}/shibboleth/inqueue.pem
+%config %{_sysconfdir}/shibboleth/shar.crt
+%config %{_sysconfdir}/shibboleth/shar.key
+%{_sysconfdir}/shibboleth/apache*.config
+
 %exclude %{_bindir}/shibtest
-%exclude %{_bindir}/signtest
+%exclude %{_bindir}/posttest
 %exclude %{_bindir}/test-client
-%{_libdir}/libshib.so.*
-%{_libexecdir}/mod_shib_20.so
-%{_libexecdir}/xmlproviders.so
-%{_datadir}/shibboleth/*.xsd
-%config %{_datadir}/shibboleth/*.xml
-%{?_with_mysql:%{_libexecdir}/shib-mysql-ccache.so}
+%exclude %{_libexecdir}/*.la
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}
 %{_libdir}/libshib.so
+%{_libdir}/libshib-target.so
 
 %changelog
 * Tue Oct 19 2004  Derek Atkins  <derek@ihtfp.com>  - 1.2-1