X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-xmltooling.git;a=blobdiff_plain;f=xmltooling.spec.in;h=b8f5f8d8e48f715a426848134dabbce00afa203b;hp=095983b0a20db7a7702984a4866c5c4d3569717e;hb=HEAD;hpb=9e4cdc832243366772a763108f85275ae2477bf1

diff --git a/xmltooling.spec.in b/xmltooling.spec.in
index 095983b..b8f5f8d 100644
--- a/xmltooling.spec.in
+++ b/xmltooling.spec.in
@@ -6,22 +6,18 @@ Group:		Development/Libraries/C and C++
 Vendor:		Shibboleth Consortium
 License:	Apache 2.0
 URL:		http://www.opensaml.org/
-Source:		%{name}-%{version}.tar.gz
+Source:		%{name}-%{version}.tar.bz2
 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
+BuildRequires:  xerces-c-devel >= 3.1
 %else
-BuildRequires:  libxerces-c-devel >= 2.8.0
-%endif
+BuildRequires:  libxerces-c-devel >= 3.1
 %endif
-BuildRequires:  libxml-security-c-devel >= 1.4.0
+BuildRequires:  libxml-security-c-devel >= 1.7.3
 %{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 1.0.4}
 BuildRequires: gcc-c++, openssl-devel, boost-devel >= 1.32.0
-%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
+%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 || 0%{?amzn} >= 1
 BuildRequires: libcurl-openssl-devel >= 7.21.7
 Requires: libcurl-openssl >= 7.21.7
 %else
@@ -41,8 +37,8 @@ BuildRequires: redhat-rpm-config
 %define pkgdocdir %{_docdir}/%{name}-%{version}
 %endif
 
-# Prevent the RH6 package from requiring a vanilla libcurl.
-%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
+# Prevent the RHEL/etc 6+ package from requiring a vanilla libcurl.
+%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 || 0%{?amzn} >= 1
 %filter_from_requires /libcurl\.so\..*/d
 %filter_setup
 %endif
@@ -59,7 +55,7 @@ Summary:    OpenSAML XMLTooling library
 Group:      Development/Libraries/C and C++
 Provides:   @PACKAGE_NAME@ = %{version}-%{release}
 Obsoletes:  @PACKAGE_NAME@ < %{version}-%{release}
-%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
+%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 || 0%{?amzn} >= 1
 Requires: libcurl-openssl >= 7.21.7
 %endif
 
@@ -78,20 +74,16 @@ Group:		Development/Libraries/C and C++
 Requires:	lib@PACKAGE_NAME@6 = %{version}-%{release}
 Provides:	@PACKAGE_NAME@-devel = %{version}-%{release}
 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
+Requires:  xerces-c-devel >= 3.1
 %else
-Requires:  libxerces-c-devel >= 2.8.0
+Requires:  libxerces-c-devel >= 3.1
 %endif
-%endif
-Requires: libxml-security-c-devel >= 1.4.0
+Requires: libxml-security-c-devel >= 1.7.3
 %{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0}
 %{!?_with_log4cpp:Requires: liblog4shib-devel >= 1.0.4}
 Requires: openssl-devel, boost-devel >= 1.32.0
-%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
+%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 || 0%{?amzn} >= 1
 Requires: libcurl-openssl-devel >= 7.21.7
 %else
 Requires: curl-devel >= 7.10.6
@@ -123,7 +115,7 @@ This package includes XML schemas and related files.
 %setup -q
 
 %build
-%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
+%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 || 0%{?amzn} >= 1
 %configure %{?@PACKAGE_NAME@_options} --with-curl=/opt/shibboleth
 %else
 %configure %{?@PACKAGE_NAME@_options}
@@ -166,6 +158,11 @@ This package includes XML schemas and related files.
 %doc %{pkgdocdir}
 
 %changelog
+* Thu Feb 26 2015 Scott Cantor <cantor.2@osu.edu> - 1.5.4-1
+- Require Xerces 3.1 even on older platforms
+- Add Amazon platform checks
+- Switch to bz2 source to avoid future SuSE issues
+
 * Tue May 13 2014 Ian Young <ian@iay.org.uk> - 1.5.3-1.2
 - Update package dependencies for RHEL/CentOS 7