From 9028292145271dfae2028b32da797a3f19e74ca4 Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Wed, 27 Aug 2014 15:17:43 +0000 Subject: [PATCH] https://issues.shibboleth.net/jira/browse/SSPCPP-544 --- shibboleth.spec.in | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/shibboleth.spec.in b/shibboleth.spec.in index 26c3b20..2390356 100644 --- 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 @@ -76,9 +80,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 @@ -336,6 +344,10 @@ fi %doc %{pkgdocdir}/api %changelog +* Tue May 13 2014 Ian Young - 2.5.3-1.2 +- Update package dependencies for RHEL/CentOS 7 +- Fix bogus dates in changelog + * Sat Jun 8 2013 Scott Cantor - 2.5.2-1 - Add --with-gssapi using MIT K5 by default @@ -422,10 +434,10 @@ fi - Applied fix for secadv 20061002 - Fix for metadata loader loop -* Wed Jun 15 2006 Scott Cantor - 1.3-10 +* Thu Jun 15 2006 Scott Cantor - 1.3-10 - Applied fix for sec 20060615 -* Fri Apr 15 2006 Scott Cantor - 1.3-9 +* Sat Apr 15 2006 Scott Cantor - 1.3-9 - Misc. patches, SuSE, Apache 2.2, gcc 4.1, and 64-bit support * Mon Jan 9 2006 Scott Cantor - 1.3-8 -- 2.1.4