SSPCPP-616 - clean up concatenated string literals

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

diff --git a/xmltooling.spec.in b/xmltooling.spec.in
index feb6ec2..095983b 100644 (file)
--- a/xmltooling.spec.in
+++ b/xmltooling.spec.in
@@ -3,7 +3,7 @@ Version:        @PACKAGE_VERSION@
 Release:       1
 Summary:       OpenSAML XMLTooling library
 Group:         Development/Libraries/C and C++
-Vendor:                Internet2
+Vendor:                Shibboleth Consortium
 License:       Apache 2.0
 URL:           http://www.opensaml.org/
 Source:                %{name}-%{version}.tar.gz
@@ -11,8 +11,12 @@ BuildRoot:   %{_tmppath}/%{name}-%{version}-root
 %if 0%{?suse_version} > 1030 && 0%{?suse_version} < 1130
 BuildRequires:  libXerces-c-devel >= 2.8.0
 %else
+%if 0%{?rhel} >= 7 || 0%{?centos_version} >= 700
+BuildRequires:  xerces-c-devel >= 2.8
+%else
 BuildRequires:  libxerces-c-devel >= 2.8.0
 %endif
+%endif
 BuildRequires:  libxml-security-c-devel >= 1.4.0
 %{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 1.0.4}
@@ -77,8 +81,12 @@ Obsoletes:   @PACKAGE_NAME@-devel < %{version}-%{release}
 %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
+%else
 Requires:  libxerces-c-devel >= 2.8.0
 %endif
+%endif
 Requires: libxml-security-c-devel >= 1.4.0
 %{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0}
 %{!?_with_log4cpp:Requires: liblog4shib-devel >= 1.0.4}
@@ -158,6 +166,9 @@ This package includes XML schemas and related files.
 %doc %{pkgdocdir}
 
 %changelog
+* Tue May 13 2014 Ian Young <ian@iay.org.uk> - 1.5.3-1.2
+- Update package dependencies for RHEL/CentOS 7
+
 * Wed Dec 14 2011 Scott Cantor  <cantor.2@osu.edu>  - 1.5-1
 - Update lib package number.
 - Add boost-devel dependency.