SSPCPP-616 - clean up concatenated string literals

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

diff --git a/opensaml.spec.in b/opensaml.spec.in
index e2c2d2a..611f747 100644 (file)
--- a/opensaml.spec.in
+++ b/opensaml.spec.in
@@ -1,9 +1,9 @@
 Name:          @PACKAGE_NAME@
 Version:       @PACKAGE_VERSION@
 Release:       1
-Summary:    OpenSAML SAML library
+Summary:       OpenSAML SAML library
 Group:         Development/Libraries/C and C++
-Vendor:                Internet2
+Vendor:                Shibboleth Consortium
 License:       Apache 2.0
 URL:           http://www.opensaml.org/
 Source0:       %{name}-%{version}.tar.gz
@@ -11,12 +11,16 @@ 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
 BuildRequires:  libxmltooling-devel >= 1.4
 %{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
-%{!?_with_log4cpp:BuildRequires: liblog4shib-devel}
+%{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 1.0.4}
 BuildRequires:  gcc-c++, boost-devel >= 1.32.0
 %if 0%{?suse_version} > 1000
 BuildRequires: pkg-config
@@ -68,14 +72,18 @@ Requires:   libsaml8 = %{version}-%{release}
 Provides:      @PACKAGE_NAME@-devel = %{version}-%{release}
 Obsoletes:     @PACKAGE_NAME@-devel < %{version}-%{release}
 %if 0%{?suse_version} > 1030 && 0%{?suse_version} < 1130
-BuildRequires:  libXerces-c-devel >= 2.8.0
+Requires:  libXerces-c-devel >= 2.8.0
 %else
-BuildRequires:  libxerces-c-devel >= 2.8.0
+%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
 Requires: libxmltooling-devel >= 1.4
 %{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0}
-%{!?_with_log4cpp:Requires: liblog4shib-devel}
+%{!?_with_log4cpp:Requires: liblog4shib-devel >= 1.0.4}
 
 %description -n libsaml-devel
 OpenSAML is an open source implementation of the OASIS Security Assertion
@@ -142,6 +150,10 @@ This package includes XML schemas and related files.
 %doc %{pkgdocdir}
 
 %changelog
+* Tue May 13 2014 Ian Young <ian@iay.org.uk> - 2.5.3-1.2
+- Update package dependencies for RHEL/CentOS 7
+- Fixed bogus dates in changelog
+
 * Wed Dec 14 2011 Scott Cantor  <cantor.2@osu.edu>  - 2.5-1
 - Update lib package number.
 - Add boost-devel dependency.
@@ -182,5 +194,5 @@ This package includes XML schemas and related files.
 * Fri Jul 13 2007  Scott Cantor  <cantor.2@osu.edu>  - 2.0-2
 - Second alpha.
 
-* Sun Apr 16 2007  Scott Cantor  <cantor.2@osu.edu>  - 2.0-1
+* Mon Apr 16 2007  Scott Cantor  <cantor.2@osu.edu>  - 2.0-1
 - First SPEC file for 2.0.