From cbf3451354a43eec11435bf97242a39fd37af71a Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Thu, 26 Feb 2015 22:04:31 +0000 Subject: [PATCH] Update library version header, require Xerces 3.1 on older SUSE --- shibboleth.spec.in | 14 +++++--------- shibsp/version.h | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/shibboleth.spec.in b/shibboleth.spec.in index b0d3d0c..d40fe69 100644 --- a/shibboleth.spec.in +++ b/shibboleth.spec.in @@ -17,12 +17,12 @@ 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 >= 3.1 %else %if 0%{?rhel} >= 7 || 0%{?centos_version} >= 700 -BuildRequires: xerces-c-devel >= 2.8.0 +BuildRequires: xerces-c-devel >= 3.1 %else -BuildRequires: libxerces-c-devel >= 2.8.0 +BuildRequires: libxerces-c-devel >= 3.1 %endif %endif BuildRequires: libxml-security-c-devel >= 1.4.0 @@ -82,14 +82,10 @@ 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 %if 0%{?rhel} >= 7 || 0%{?centos_version} >= 700 -Requires: xerces-c-devel >= 2.8.0 +Requires: xerces-c-devel >= 3.1 %else -Requires: libxerces-c-devel >= 2.8.0 -%endif +Requires: libxerces-c-devel >= 3.1 %endif Requires: libxml-security-c-devel >= 1.4.0 Requires: libxmltooling-devel >= 1.5.0 diff --git a/shibsp/version.h b/shibsp/version.h index cdd9dfa..93d0ca8 100644 --- a/shibsp/version.h +++ b/shibsp/version.h @@ -44,7 +44,7 @@ #define SHIBSP_VERSION_MAJOR 1 #define SHIBSP_VERSION_MINOR 5 -#define SHIBSP_VERSION_REVISION 3 +#define SHIBSP_VERSION_REVISION 4 /** DO NOT MODIFY BELOW THIS LINE */ -- 2.1.4