X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=shibboleth.spec.in;h=26c3b20c085e33bb643845fc117c47fe0ee20c1d;hb=715f1dfc59780e378958cd0aa5eecba2e783453e;hp=69849e1e2cebc5a001ad2a4e389d28453364f5c4;hpb=d525f856853f89ee158473372ee5b3394a74336c;p=shibboleth%2Fcpp-sp.git diff --git a/shibboleth.spec.in b/shibboleth.spec.in index 69849e1..26c3b20 100644 --- a/shibboleth.spec.in +++ b/shibboleth.spec.in @@ -1,4 +1,4 @@ -Name: shibboleth-sp +Name: shibboleth Version: @PACKAGE_VERSION@ Release: 1 Summary: Open source system for attribute-based Web SSO @@ -6,11 +6,15 @@ Group: Productivity/Networking/Security Vendor: Shibboleth Consortium License: Apache 2.0 URL: http://shibboleth.net/ -Source: %{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-root -Obsoletes: @PACKAGE_NAME@ < %{version}-%{release} +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 @@ -18,15 +22,16 @@ BuildRequires: libXerces-c-devel >= 2.8.0 BuildRequires: libxerces-c-devel >= 2.8.0 %endif BuildRequires: libxml-security-c-devel >= 1.4.0 -BuildRequires: libxmltooling-devel >= 1.5 -BuildRequires: libsaml-devel >= 2.5 +BuildRequires: libxmltooling-devel >= 1.5.0 +BuildRequires: libsaml-devel >= 2.5.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 +%{!?_without_gssapi:BuildRequires: krb5-devel} %{!?_without_doxygen:BuildRequires: doxygen} %{!?_without_odbc:BuildRequires:unixODBC-devel} %{?_with_fastcgi:BuildRequires: fcgi-devel} @@ -35,7 +40,11 @@ BuildRequires: libmemcached-devel %endif %{?_with_memcached:BuildRequires: libmemcached-devel} %if "%{_vendor}" == "redhat" +%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 +%{!?_without_builtinapache:BuildRequires: httpd-devel%{?_isa}} +%else %{!?_without_builtinapache:BuildRequires: httpd-devel} +%endif BuildRequires: redhat-rpm-config Requires(pre): shadow-utils Requires(post): chkconfig @@ -65,15 +74,15 @@ daemon, default plugins, and Apache module(s). Summary: Shibboleth Development Headers Group: Development/Libraries/C and C++ Requires: %{name} = %{version}-%{release} -Obsoletes: shibboleth-devel < %{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 Requires: libxerces-c-devel >= 2.8.0 %endif Requires: libxml-security-c-devel >= 1.4.0 -Requires: libxmltooling-devel >= 1.5 -Requires: libsaml-devel >= 2.5 +Requires: libxmltooling-devel >= 1.5.0 +Requires: libsaml-devel >= 2.5.0 %{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0} %{!?_with_log4cpp:Requires: liblog4shib-devel >= 1.0.4} @@ -85,13 +94,13 @@ exchange of rich attributes subject to privacy controls. This package includes files needed for development with Shibboleth. %prep -%setup -q +%setup -n %{name}-sp-%{version} %build %if 0%{?centos_version} >= 600 - %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_memcached:--with-memcached} %{?shib_options} + %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{!?_without_memcached:--with-memcached} %{?shib_options} %else - %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{?_with_memcached} %{?shib_options} + %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{?_with_memcached} %{?shib_options} %endif %{__make} pkgdocdir=%{pkgdocdir} @@ -190,7 +199,7 @@ getent passwd %{runuser} >/dev/null || useradd -r -g %{runuser} \ exit 0 %post -%ifnos solaris2.8 solaris2.9 solaris2.10 +%ifnos solaris2.8 solaris2.9 solaris2.10 solaris2.11 /sbin/ldconfig %endif @@ -227,15 +236,6 @@ fi # 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 @@ -263,7 +263,7 @@ fi 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" @@ -336,7 +336,18 @@ fi %doc %{pkgdocdir}/api %changelog -* Thu Mar 1 2012 Scott Cantor - 2.5-1 +* Sat Jun 8 2013 Scott Cantor - 2.5.2-1 +- Add --with-gssapi using MIT K5 by default + +* Tue Sep 25 2012 Scott Cantor - 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 - 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 - 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