https://issues.shibboleth.net/jira/browse/SSPCPP-606

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

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index 5e61404..e5ff200 100644 (file)
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -17,9 +17,13 @@ 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
+BuildRequires:  libXerces-c-devel >= 2.8.0
 %else
-BuildRequires: libxerces-c-devel >= 2.8.0
+%if 0%{?rhel} >= 7 || 0%{?centos_version} >= 700
+BuildRequires:  xerces-c-devel >= 2.8.0
+%else
+BuildRequires:  libxerces-c-devel >= 2.8.0
+%endif
 %endif
 BuildRequires: libxml-security-c-devel >= 1.4.0
 BuildRequires: libxmltooling-devel >= 1.5.0
@@ -30,7 +34,11 @@ BuildRequires:       libsaml-devel >= 2.5.0
 Requires:      libcurl-openssl%{?_isa} >= 7.21.7
 BuildRequires: chrpath
 %endif
+%if 0%{?suse_version} > 1300
+BuildRequires: libtool
+%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}
@@ -75,9 +83,13 @@ 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
+Requires:       libXerces-c-devel >= 2.8.0
+%else
+%if 0%{?rhel} >= 7 || 0%{?centos_version} >= 700
+Requires:  xerces-c-devel >= 2.8.0
 %else
-Requires:      libxerces-c-devel >= 2.8.0
+Requires:       libxerces-c-devel >= 2.8.0
+%endif
 %endif
 Requires:      libxml-security-c-devel >= 1.4.0
 Requires:      libxmltooling-devel >= 1.5.0
@@ -97,9 +109,9 @@ This package includes files needed for development with Shibboleth.
 
 %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}
 
@@ -302,7 +314,9 @@ fi
 %dir %{_libdir}/shibboleth
 %{_libdir}/shibboleth/*
 %attr(0750,%{runuser},%{runuser}) %dir %{_localstatedir}/log/shibboleth
+%if 0%{?suse_version} > 1300
 %attr(0755,%{runuser},%{runuser}) %dir %{_localstatedir}/run/shibboleth
+%endif
 %attr(0755,%{runuser},%{runuser}) %dir %{_localstatedir}/cache/shibboleth
 %dir %{_datadir}/xml/shibboleth
 %{_datadir}/xml/shibboleth/*
@@ -335,6 +349,13 @@ fi
 %doc %{pkgdocdir}/api
 
 %changelog
+* Tue May 13 2014 Ian Young <ian@iay.org.uk> - 2.5.3-1.2
+- Update package dependencies for RHEL/CentOS 7
+- Fix bogus dates in changelog
+
+* Sat Jun 8 2013   Scott Cantor  <cantor.2@osu.edu>  - 2.5.2-1
+- Add --with-gssapi using MIT K5 by default
+
 * 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
@@ -418,10 +439,10 @@ fi
 - Applied fix for secadv 20061002
 - Fix for metadata loader loop
 
-* Wed Jun 15 2006 Scott Cantor  <cantor.2@osu.edu>  - 1.3-10
+* Thu Jun 15 2006 Scott Cantor  <cantor.2@osu.edu>  - 1.3-10
 - Applied fix for sec 20060615
 
-* Fri Apr 15 2006 Scott Cantor  <cantor.2@osu.edu>  - 1.3-9
+* Sat Apr 15 2006 Scott Cantor  <cantor.2@osu.edu>  - 1.3-9
 - Misc. patches, SuSE, Apache 2.2, gcc 4.1, and 64-bit support
 
 * Mon Jan 9 2006 Scott Cantor  <cantor.2@osu.edu>  - 1.3-8