From: Scott Cantor <cantor.2@osu.edu>
Date: Fri, 13 Mar 2015 18:15:14 +0000 (+0000)
Subject: Add Amazon checks to libcurl overrides
X-Git-Tag: 1.5.4~1
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-xmltooling.git;a=commitdiff_plain;h=5cc5432ff11c2806d6acaef33e2f9bbc48371fbd

Add Amazon checks to libcurl overrides
---

diff --git a/xmltooling.spec.in b/xmltooling.spec.in
index edb11a1..c60a98b 100644
--- a/xmltooling.spec.in
+++ b/xmltooling.spec.in
@@ -17,7 +17,7 @@ BuildRequires:  libxml-security-c-devel >= 1.4.0
 %{?_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
@@ -37,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
@@ -55,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
 
@@ -83,7 +83,7 @@ Requires: libxml-security-c-devel >= 1.4.0
 %{?_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
@@ -115,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}
@@ -160,6 +160,7 @@ This package includes XML schemas and related files.
 %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