X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=shibboleth.spec.in;h=2b8358bc9c89c3132f75946ee9f3417afdbf9552;hb=daddfae725714b8b61d7b21d83378bc239926b37;hp=f35519fb5058413ea7ccc458400d585a319a277c;hpb=54db70a102daad9c0c8ee0b6e958c51eea1c6fea;p=shibboleth%2Fsp.git

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index f35519f..2b8358b 100644
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -1,18 +1,20 @@
 Name:		shibboleth
 Summary:	Open source system to enable inter-institutional resource sharing
 Version:	@-VERSION-@
-Release:	4
+Release:	6
 #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.4.0
+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}
+%{?_with_fastcgi:BuildRequires: fcgi-devel}
 %if "%{_vendor}" == "redhat"
 %{!?_without_builtinapache:BuildRequires: httpd-devel}
 %endif
@@ -59,12 +61,12 @@ Shibboleth Library API documentation generated by doxygen.
 %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
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install NOKEYGEN=1 DESTDIR=$RPM_BUILD_ROOT
 
 %if "%{_vendor}" == "suse"
 	%{__sed} -i "s/\/var\/log\/httpd/\/var\/log\/apache2/g" \
@@ -128,6 +130,10 @@ fi
 	fi
 %endif
 
+# Key generation
+cd %{_sysconfdir}/%{name}
+sh ./keygen.sh -b
+
 %postun
 %ifnos solaris2.8 solaris2.9 solaris2.10
 /sbin/ldconfig
@@ -147,6 +153,7 @@ fi
 	    %{__rm} -f %{_sysconfdir}/init.d/shibd
 %endif
 
+%files
 %defattr(-,root,root,-)
 %{_sbindir}/shibd
 %{_bindir}/mdquery
@@ -154,33 +161,35 @@ fi
 %{_libdir}/libshibsp.so.*
 %{_libdir}/libshibsp-lite.so.*
 %dir %{_libdir}/%{name}
-%{_libdir}/%{name}/*.so
+%{_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
+%{_sysconfdir}/%{name}/keygen.sh
 %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}/NOTICE.txt
-%{_datadir}/doc/%{name}/README.txt
-%{_datadir}/doc/%{name}/RELEASE.txt
 %{_datadir}/doc/%{name}/LOG4CPP.LICENSE
-%{_datadir}/doc/%{name}/OPENSSL.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,-)
@@ -193,6 +202,9 @@ fi
 %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