From 5187deb99898093faa67b898af4599ab53dce3cd Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Sun, 26 Jun 2011 19:13:03 +0000 Subject: [PATCH] Use custom curl package for RHEL6. --- xmltooling.spec.in | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/xmltooling.spec.in b/xmltooling.spec.in index def50a4..25d2f1d 100644 --- a/xmltooling.spec.in +++ b/xmltooling.spec.in @@ -16,7 +16,12 @@ BuildRequires: libxerces-c-devel >= 2.8.0 BuildRequires: libxml-security-c-devel >= 1.4.0 %{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0} %{!?_with_log4cpp:BuildRequires: liblog4shib-devel} -BuildRequires: gcc-c++, openssl-devel, curl-devel >= 7.10.6 +BuildRequires: gcc-c++, openssl-devel +%if 0%{?rhel} >= 6 +BuildRequires: libcurl-openssl-devel >= 7.21.7 +%else +BuildRequires: curl-devel >= 7.10.6 +%endif %if 0%{?suse_version} > 1000 BuildRequires: pkg-config %endif @@ -67,7 +72,12 @@ Requires: libxerces-c-devel >= 2.8.0 Requires: libxml-security-c-devel >= 1.4.0 %{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0} %{!?_with_log4cpp:Requires: liblog4shib-devel} -Requires: openssl-devel, curl-devel >= 7.10.6 +Requires: openssl-devel +%if 0%{?rhel} >= 6 +Requires: libcurl-openssl-devel >= 7.21.7 +%else +Requires: curl-devel >= 7.10.6 +%endif %description -n lib@PACKAGE_NAME@-devel The XMLTooling library contains generic XML parsing and processing @@ -95,7 +105,11 @@ This package includes XML schemas and related files. %setup -q %build +%if 0%{?rhel} >= 6 +%configure %{?@PACKAGE_NAME@_options} --with-curl=/opt/shibboleth +%else %configure %{?@PACKAGE_NAME@_options} +%endif %{__make} %install @@ -134,6 +148,9 @@ This package includes XML schemas and related files. %doc %{pkgdocdir} %changelog +* Sun Jun 26 2011 Scott Cantor - 1.4.2-1 +- Override curl build for RHEL6. + * Tue Oct 26 2010 Scott Cantor - 1.4-1 - Update version - Add pkg-config support. -- 2.1.4