projects / shibboleth / cpp-sp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
https://issues.shibboleth.net/jira/browse/SSPCPP-100
[shibboleth/cpp-sp.git] / shibboleth.spec.in
diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index 179ad1f..37e5262 100644 (file)
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -1,14 +1,14 @@
 Name:          shibboleth
-Summary:       Open source system to enable inter-institutional resource sharing
+Summary:       Open source system for attribute-based Web SSO
 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: 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
@@ -66,59 +66,58 @@ Shibboleth Library API documentation generated by doxygen.
 
 %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" \
                $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/native.logger
 %endif
 
-%check || :
-%{__make} check
-
-%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
-
-%post
-%ifnos solaris2.8 solaris2.9 solaris2.10
-/sbin/ldconfig
-%endif
-
-
 # Plug the SP into Apache on a recognized system.
 APACHE_CONFIG="no"
 if [ -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/mod_shib_13.so ] ; then
-       APACHE_CONFIG="apache.config"
+    APACHE_CONFIG="apache.config"
 fi
 if [ -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/mod_shib_20.so ] ; then
-       APACHE_CONFIG="apache2.config"
+    APACHE_CONFIG="apache2.config"
 fi
 if [ -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/mod_shib_22.so ] ; then
-       APACHE_CONFIG="apache22.config"
+    APACHE_CONFIG="apache22.config"
 fi
 if [ "$APACHE_CONFIG" != "no" ] ; then
-       APACHE_CONFD="no"
-       if [ -d %{_sysconfdir}/httpd/conf.d ] ; then
-               APACHE_CONFD="%{_sysconfdir}/httpd/conf.d"
-       fi
-       if [ -d %{_sysconfdir}/apache2/conf.d ] ; then
-               APACHE_CONFD="%{_sysconfdir}/apache2/conf.d"
-       fi
-       if [ "$APACHE_CONFD" != "no" ] ; then
-               if [ ! -f $APACHE_CONFD/shib.conf ] ; then
+    APACHE_CONFD="no"
+    if [ -d %{_sysconfdir}/httpd/conf.d ] ; then
+            APACHE_CONFD="%{_sysconfdir}/httpd/conf.d"
+    fi
+    if [ -d %{_sysconfdir}/apache2/conf.d ] ; then
+            APACHE_CONFD="%{_sysconfdir}/apache2/conf.d"
+    fi
+    if [ "$APACHE_CONFD" != "no" ] ; then
+        if [ ! -f $APACHE_CONFD/shib.conf ] ; then
 %if "%{_vendor}" == "suse"
-                   %{__sed} "s/\/usr\/doc\/%{name}/\/usr\/share\/doc\/packages\/%{name}/g" \
-                               %{_sysconfdir}/%{name}/$APACHE_CONFIG \
-                               > $APACHE_CONFD/shib.conf
+            %{__sed} "s/\/usr\/doc\/%{name}/\/usr\/share\/doc\/packages\/%{name}/g" \
+                %{_sysconfdir}/%{name}/$APACHE_CONFIG \
+                > $APACHE_CONFD/shib.conf
 %else
-                       %{__sed} "s/\/usr\/doc\/%{name}/\/usr\/share\/doc\/%{name}-@-VERSION-@/g" \
-                           %{_sysconfdir}/%{name}/$APACHE_CONFIG \
-                           > $APACHE_CONFD/shib.conf
+            %{__sed} "s/\/usr\/doc\/%{name}/\/usr\/share\/doc\/%{name}-@-VERSION-@/g" \
+                %{_sysconfdir}/%{name}/$APACHE_CONFIG \
+                > $APACHE_CONFD/shib.conf
 %endif
-               fi
-       fi
+        fi
+    fi
 fi
 
+%check || :
+%{__make} check
+
+%clean
+[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
+
+%post
+%ifnos solaris2.8 solaris2.9 solaris2.10
+/sbin/ldconfig
+%endif
+
 # Install the shibd init.d scripts and service
 %if "%{_vendor}" == "redhat"
        if [ -d %{_sysconfdir}/init.d ] ; then
@@ -130,18 +129,15 @@ fi
        fi
 %endif
 
+# Key generation
+cd %{_sysconfdir}/%{name}
+sh ./keygen.sh -b
+
 %postun
 %ifnos solaris2.8 solaris2.9 solaris2.10
 /sbin/ldconfig
 %endif
 
-# delete the Apache configuration if we're being removed
-[ "$1" = 0 ] || exit 0
-[ -f %{_sysconfdir}/httpd/conf.d/shib.conf ] && \
-    %{__rm} -f %{_sysconfdir}/httpd/conf.d/shib.conf
-[ -f %{_sysconfdir}/apache2/conf.d/shib.conf ] && \
-    %{__rm} -f %{_sysconfdir}/apache2/conf.d/shib.conf
-
 # clear init.d state
 %if "%{_vendor}" == "redhat"
        chkconfig --del shibd
@@ -160,23 +156,28 @@ fi
 %{_libdir}/%{name}/*
 %exclude %{_libdir}/%{name}/*.la
 %dir %{_localstatedir}/log/%{name}
+%dir %{_localstatedir}/run/%{name}
 %dir %{_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
+%if "%{_vendor}" == "suse"
+%config %{_sysconfdir}/apache2/conf.d/shib.conf
+%else
+%config %{_sysconfdir}/httpd/conf.d/shib.conf
+%endif
 %{_sysconfdir}/%{name}/*.dist
 %{_sysconfdir}/%{name}/apache*.config
 %{_sysconfdir}/%{name}/shibd-redhat
 %{_sysconfdir}/%{name}/shibd-debian
 %{_sysconfdir}/%{name}/shibd-osx.plist
+%{_sysconfdir}/%{name}/keygen.sh
+%{_sysconfdir}/%{name}/*.xsl
 %docdir %{_datadir}/doc/%{name}
 %{_datadir}/doc/%{name}/CREDITS.txt
-%{_datadir}/doc/%{name}/FASTCGGI.LICENSE
-%{_datadir}/doc/%{name}/INSTALL.txt
+%{_datadir}/doc/%{name}/FASTCGI.LICENSE
 %{_datadir}/doc/%{name}/LICENSE.txt
 %{_datadir}/doc/%{name}/LOG4CPP.LICENSE
 %{_datadir}/doc/%{name}/logo.jpg
@@ -185,7 +186,6 @@ fi
 %{_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,-)
@@ -198,6 +198,15 @@ fi
 %doc %{_datadir}/doc/%{name}/api
 
 %changelog
+* Tue Jun 10 2008  Scott Cantor  <cantor.2@osu.edu>  - 2.1-1
+- Change shib.conf handling to treat as config file.
+
+* Mon Mar 17 2008  Scott Cantor  <cantor.2@osu.edu>  - 2.0-6
+- Official release.
+
+* 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
Unnamed repository; edit this file 'description' to name the repository.