X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=shibboleth.spec.in;h=8edd2a8b155e728e792eac2730e63c70bbae3a33;hb=58c7b01c1c4c08d15e044391780e78b61289e851;hp=2cf0d01ee8193d44308172990d35e75274274149;hpb=086c10e7dbc922aab29a95bc21327685d00c0366;p=shibboleth%2Fsp.git

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index 2cf0d01..8edd2a8 100644
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -1,19 +1,20 @@
 Name:		shibboleth
 Summary:	Open source system to enable inter-institutional resource sharing
 Version:	@-VERSION-@
-Release:	3
+Release:	5
 #Copyright:	Internet2
 Group:		System Environment/Libraries
 License:	Apache style
 URL:		http://shibboleth.internet2.edu/
 Source0:	http://shibboleth.internet2.edu/downloads/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	openssl-devel, curl-devel >= 7.10.6
-BuildRequires:	xerces%{?xercesver}-c-devel >= 2.6.1, xml-security-c-devel >= 1.3.1
+BuildRequires:	openssl-devel
+BuildRequires:	xerces%{?xercesver}-c-devel >= 2.8.0
+BuildRequires:  xml-security-c-devel >= 1.4.0
 BuildRequires:	zlib-devel, opensaml-devel >= 2.0
-%{?_with_log4cpp:BuildRequires:	log4cpp-devel >= 0.3.5}
+%{?_with_log4cpp:BuildRequires:	log4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: log4shib-devel}
-%{!?_without_odbc:BuildRequires: unixODBC-devel}
+%{?_with_fastcgi:BuildRequires: fcgi-devel}
 %if "%{_vendor}" == "redhat"
 %{!?_without_builtinapache:BuildRequires: httpd-devel}
 %endif
@@ -48,27 +49,30 @@ education community.
 This package contains the headers and other necessary files to build
 applications that use the shibboleth library.
 
+%package docs
+Summary: Shibboleth API Documentation
+Group: Development/Libraries
+Requires: %{name} = %{version}
+
+%description docs
+Shibboleth Library API documentation generated by doxygen.
+
 %prep
 %setup -q
 
 %build
-%configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?shib_options}
+%configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{?shib_options}
 %{__make}
 
 %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" \
 		$RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/native.logger
 %endif
 
-find $RPM_BUILD_ROOT/%{_libexecdir} -type f -or -type l |
-  %{__sed} -e "s|$RPM_BUILD_ROOT||" | sort > rpm.filelist
-
 %check || :
 %{__make} check
 
@@ -83,13 +87,13 @@ find $RPM_BUILD_ROOT/%{_libexecdir} -type f -or -type l |
 
 # Plug the SP into Apache on a recognized system.
 APACHE_CONFIG="no"
-if [ -f $RPM_BUILD_ROOT/%{_libexecdir}/mod_shib_13.so ] ; then
+if [ -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/mod_shib_13.so ] ; then
 	APACHE_CONFIG="apache.config"
 fi
-if [ -f $RPM_BUILD_ROOT/%{_libexecdir}/mod_shib_20.so ] ; then
+if [ -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/mod_shib_20.so ] ; then
 	APACHE_CONFIG="apache2.config"
 fi
-if [ -f $RPM_BUILD_ROOT/%{_libexecdir}/mod_shib_22.so ] ; then
+if [ -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/mod_shib_22.so ] ; then
 	APACHE_CONFIG="apache22.config"
 fi
 if [ "$APACHE_CONFIG" != "no" ] ; then
@@ -145,30 +149,42 @@ fi
 	    %{__rm} -f %{_sysconfdir}/init.d/shibd
 %endif
 
-%files -f rpm.filelist
+%files
 %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}/samlquery
 %{_bindir}/mdquery
+%{_bindir}/resolvertest
 %{_libdir}/libshibsp.so.*
 %{_libdir}/libshibsp-lite.so.*
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/*
+%exclude %{_libdir}/%{name}/*.la
 %dir %{_localstatedir}/log/%{name}
+%dir %{_localstatedir}/run/%{name}
 %dir %{_datadir}/xml/%{name}
-%{_datadir}/xml/%{name}
+%{_datadir}/xml/%{name}/*
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/*.xml
 %config(noreplace) %{_sysconfdir}/%{name}/*.html
 %config(noreplace) %{_sysconfdir}/%{name}/*.logger
-%config %{_sysconfdir}/%{name}/sp-example.crt
-%config %{_sysconfdir}/%{name}/sp-example.key
 %{_sysconfdir}/%{name}/*.dist
 %{_sysconfdir}/%{name}/apache*.config
 %{_sysconfdir}/%{name}/shibd-redhat
 %{_sysconfdir}/%{name}/shibd-debian
 %{_sysconfdir}/%{name}/shibd-osx.plist
-%exclude %{_libexecdir}/*.la
+%docdir %{_datadir}/doc/%{name}
+%{_datadir}/doc/%{name}/CREDITS.txt
+%{_datadir}/doc/%{name}/FASTCGI.LICENSE
+%{_datadir}/doc/%{name}/INSTALL.txt
+%{_datadir}/doc/%{name}/LICENSE.txt
+%{_datadir}/doc/%{name}/LOG4CPP.LICENSE
+%{_datadir}/doc/%{name}/logo.jpg
+%{_datadir}/doc/%{name}/main.css
+%{_datadir}/doc/%{name}/NOTICE.txt
+%{_datadir}/doc/%{name}/OPENSSL.LICENSE
+%{_datadir}/doc/%{name}/README.txt
+%{_datadir}/doc/%{name}/RELEASE.txt
+%exclude %{_datadir}/doc/%{name}/INSTALL-WIN32.txt
 
 %files devel
 %defattr(-,root,root,-)
@@ -176,7 +192,18 @@ fi
 %{_libdir}/libshibsp.so
 %{_libdir}/libshibsp-lite.so
 
+%files docs
+%defattr(644,root,root,755)
+%doc %{_datadir}/doc/%{name}/api
+
 %changelog
+* Fri Jan 18 2008  Scott Cantor  <cantor.2@osu.edu>  - 2.0-5
+- Release candidate 1.
+
+* Sun Oct 21 2007 Scott Cantor  <cantor.2@osu.edu>  - 2.0-4
+- libexec -> lib/shibboleth changes
+- Added doc subpackage
+
 * Thu Aug 16 2007 Scott Cantor  <cantor.2@osu.edu>  - 2.0-3
 - First public beta.