[cpp-xmltooling COMMIT] /branches/REL_1/xmltooling.spec.in

[noreply at shibboleth.net]

Author: scantor
Date: Fri Mar 13 14:15:14 2015
New Revision: 1054

URL: http://svn.shibboleth.net/view/cpp-xmltooling?rev=1054&view=rev
Log:
Add Amazon checks to libcurl overrides

Modified:
    branches/REL_1/xmltooling.spec.in

Modified: branches/REL_1/xmltooling.spec.in
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/xmltooling.spec.in?rev=1054&r1=1053&r2=1054&view=diff
==============================================================================
--- branches/REL_1/xmltooling.spec.in (original)
+++ branches/REL_1/xmltooling.spec.in Fri Mar 13 14:15:14 2015
@@ -17,7 +17,7 @@
 %{?_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 @@
 %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 @@
 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 @@
 %{?_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 @@
 %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 at _options} --with-curl=/opt/shibboleth
 %else
 %configure %{?@PACKAGE_NAME at _options}
@@ -160,6 +160,7 @@
 %changelog
 * Thu Feb 26 2015 Scott Cantor <cantor.2 at 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 at iay.org.uk> - 1.5.3-1.2