APPDATA should have been PROGRAMDATA

[shibboleth/sp.git] / shibboleth.spec.in

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index 075b12b..3961c7a 100644 (file)
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -1,4 +1,4 @@
-Name:          @PACKAGE_NAME@
+Name:          shibboleth-sp
 Version:       @PACKAGE_VERSION@
 Release:       1
 Summary:       Open source system for attribute-based Web SSO
@@ -6,8 +6,9 @@ Group:          Productivity/Networking/Security
 Vendor:                Internet2
 License:       Apache 2.0
 URL:           http://shibboleth.internet2.edu/
-Source:                %{name}-sp-%{version}.tar.gz
+Source:                %{name}-%{version}.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
+Obsoletes:     @PACKAGE_NAME@ < %{version}-%{release}
 Requires:      openssl
 PreReq:                xmltooling-schemas, opensaml-schemas
 %if 0%{?suse_version} > 1030 && 0%{?suse_version} < 1130
@@ -113,6 +114,9 @@ fi
 if [ -f $RPM_BUILD_ROOT%{_libdir}/%{name}/mod_shib_22.so ] ; then
        APACHE_CONFIG="apache22.config"
 fi
+if [ -f $RPM_BUILD_ROOT%{_libdir}/%{name}/mod_shib_24.so ] ; then
+       APACHE_CONFIG="apache24.config"
+fi
 %{?_without_builtinapache:APACHE_CONFIG="no"}
 if [ "$APACHE_CONFIG" != "no" ] ; then
        APACHE_CONFD="no"
@@ -300,6 +304,7 @@ fi
 %exclude %{_libdir}/%{name}/*.la
 %attr(0750,%{runuser},%{runuser}) %dir %{_localstatedir}/log/%{name}
 %attr(0755,%{runuser},%{runuser}) %dir %{_localstatedir}/run/%{name}
+%attr(0755,%{runuser},%{runuser}) %dir %{_localstatedir}/cache/%{name}
 %dir %{_datadir}/xml/%{name}
 %{_datadir}/xml/%{name}/*
 %dir %{_datadir}/%{name}
@@ -331,7 +336,7 @@ fi
 %doc %{pkgdocdir}/api
 
 %changelog
-* Fri Feb 10 2012  Scott Cantor  <cantor.2@osu.edu>  - 2.5-1
+* Thu Mar 1 2012  Scott Cantor  <cantor.2@osu.edu>  - 2.5-1
 - Move logo and stylesheet to version-independent tree
 - Make shib.conf noreplace
 - Post-fixup of Alias commands in older shib.conf
@@ -340,6 +345,8 @@ fi
 - Copy shibd restart for Red Hat to postun
 - Add boost-devel dependency
 - Build memcache plugin on RH6
+- Add cachedir to install
+- Add Apache 2.4 to install
 
 * Sun Jun 26 2011  Scott Cantor  <cantor.2@osu.edu>  - 2.4.3-1
 - Log files shouldn't be world readable.