From: cantor <cantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Date: Wed, 24 Jun 2009 01:18:41 +0000 (+0000)
Subject: Bit of cleanup, and add changelog.
X-Git-Tag: 2.4~251
X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;h=13d525051b5a9c20a2f5d9c4d25a91310712ab29;p=shibboleth%2Fsp.git

Bit of cleanup, and add changelog.

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

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index ef4b9af..69a32df 100644
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -79,6 +79,7 @@ Shibboleth Library API documentation generated by doxygen.
 %endif
 
 # Plug the SP into Apache on a recognized system.
+touch rpm.filelist
 APACHE_CONFIG="no"
 if [ -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/mod_shib_13.so ] ; then
     APACHE_CONFIG="apache.config"
@@ -110,11 +111,7 @@ if [ "$APACHE_CONFIG" != "no" ] ; then
             > $RPM_BUILD_ROOT$APACHE_CONFD/shib.conf
 %endif
         echo "%config $APACHE_CONFD/shib.conf" > rpm.filelist
-    else
-        echo "" > rpm.filelist
     fi
-else
-    echo "" > rpm.filelist
 fi
 
 %if "%{_vendor}" == "redhat"
@@ -165,7 +162,7 @@ sh ./keygen.sh -b
 %endif
 
 %posttrans
-# ugly hack if init script got removed during %postun by upgraded package
+# ugly hack if init script got removed during %postun by upgraded (buggy/2.1) package
 %if "%{_vendor}" == "redhat"
 	if [ ! -f %{_initrddir}/shibd ] ; then
 		%{__cp} -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/shibd-%{_vendor} $RPM_BUILD_ROOT%{_initrddir}/shibd
@@ -225,6 +222,10 @@ sh ./keygen.sh -b
 %doc %{_datadir}/doc/%{name}/api
 
 %changelog
+* Tue Jun 23 2009 Scott Cantor  <cantor.2@osu.edu>  - 2.2-2
+- Reverse without_builtinapache macro test
+- Fix init script handling on Red Hat to handle upgrades
+
 * Wed Dec 3 2008  Scott Cantor  <cantor.2@osu.edu>  - 2.2-1
 - Bump minor version.
 - Make keygen.sh executable.