-Name: shibboleth-sp
+Name: shibboleth
Version: @PACKAGE_VERSION@
Release: 1
Summary: Open source system for attribute-based Web SSO
Group: Productivity/Networking/Security
-Vendor: Internet2
+Vendor: Shibboleth Consortium
License: Apache 2.0
-URL: http://shibboleth.internet2.edu/
-Source: %{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Obsoletes: @PACKAGE_NAME@ < %{version}-%{release}
+URL: http://shibboleth.net/
+Source: %{name}-sp-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-sp-%{version}-root
+Obsoletes: shibboleth-sp = 2.5.0
Requires: openssl
-PreReq: xmltooling-schemas, opensaml-schemas
+%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
+PreReq: xmltooling-schemas%{?_isa} >= 1.5.0, opensaml-schemas%{?_isa} >= 2.5.0
+%else
+PreReq: xmltooling-schemas >= 1.5.0, opensaml-schemas >= 2.5.0
+%endif
%if 0%{?suse_version} > 1030 && 0%{?suse_version} < 1130
PreReq: %{insserv_prereq} %{fillup_prereq}
BuildRequires: libXerces-c-devel >= 2.8.0
%{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
%{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 1.0.4}
%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
-Requires: libcurl-openssl >= 7.21.7
+Requires: libcurl-openssl%{?_isa} >= 7.21.7
BuildRequires: chrpath
%endif
BuildRequires: gcc-c++, zlib-devel, boost-devel >= 1.32.0
Summary: Shibboleth Development Headers
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}-%{release}
+Obsoletes: shibboleth-sp-devel = 2.5.0
%if 0%{?suse_version} > 1030 && 0%{?suse_version} < 1130
Requires: libXerces-c-devel >= 2.8.0
%else
This package includes files needed for development with Shibboleth.
%prep
-%setup -q
+%setup -n %{name}-sp-%{version}
%build
%if 0%{?centos_version} >= 600
exit 0
%post
-%ifnos solaris2.8 solaris2.9 solaris2.10
+%ifnos solaris2.8 solaris2.9 solaris2.10 solaris2.11
/sbin/ldconfig
%endif
# This adds the proper /etc/rc*.d links for the script
/sbin/chkconfig --add shibd
-
- # On upgrade, restart components if they're already running.
- # This gets repeated now down in %postun, and the next release
- # should remove this copy. If we yank it now, we'll break upgrades.
- if [ "$1" -gt "1" ] ; then
- /etc/init.d/shibd status 1>/dev/null && /etc/init.d/shibd restart 1>/dev/null
- %{!?_without_builtinapache:/etc/init.d/httpd status 1>/dev/null && /etc/init.d/httpd restart 1>/dev/null}
- exit 0
- fi
%endif
%if "%{_vendor}" == "suse"
# This adds the proper /etc/rc*.d links for the script
exit 0
%postun
-%ifnos solaris2.8 solaris2.9 solaris2.10
+%ifnos solaris2.8 solaris2.9 solaris2.10 solaris2.11
/sbin/ldconfig
%endif
%if "%{_vendor}" == "redhat"
%doc %{pkgdocdir}/api
%changelog
-* Thu Mar 1 2012 Scott Cantor <cantor.2@osu.edu> - 2.5-1
+* Tue Sep 25 2012 Scott Cantor <cantor.2@osu.edu> - 2.5.1-1
+- Merge back various changes used in released packages
+- Prep for 2.5.1 by pulling extra restart out
+
+* Tue Aug 7 2012 Scott Cantor <cantor.2@osu.edu> - 2.5.0-2
+- Changed package name back to shibboleth because of upgrade bugs
+- Put back extra restart for this release only.
+
+* Thu Mar 1 2012 Scott Cantor <cantor.2@osu.edu> - 2.5.0-1
- Move logo and stylesheet to version-independent tree
- Make shib.conf noreplace
- Post-fixup of Alias commands in older shib.conf