[xmltooling] 01/02: Add CentOS 6 workaround to specfile

[Ferenc Wágner]

This is an automated email from the git hooks/post-receive script.

wferi-guest pushed a commit to branch maint-1.4
in repository xmltooling.

commit f990cedf20d292b199b3b91986057ff8f0eb9782
Author: Scott Cantor <cantor.2 at osu.edu>
Date:   Sat Aug 6 22:24:40 2011 +0000

    Add CentOS 6 workaround to specfile
---
 xmltooling.spec.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/xmltooling.spec.in b/xmltooling.spec.in
index 4cfc7c9..9c0d847 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}
 BuildRequires: gcc-c++, openssl-devel
-%if 0%{?rhel} >= 6
+%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
 BuildRequires: libcurl-openssl-devel >= 7.21.7
 Requires: libcurl-openssl >= 7.21.7
 %else
@@ -38,7 +38,7 @@ BuildRequires: redhat-rpm-config
 %endif
 
 # Prevent the RH6 package from requiring a vanilla libcurl.
-%if 0%{?rhel} >= 6
+%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
 %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
+%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
 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}
 Requires: openssl-devel
-%if 0%{?rhel} >= 6
+%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
 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
+%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
 %configure %{?@PACKAGE_NAME at _options} --with-curl=/opt/shibboleth
 %else
 %configure %{?@PACKAGE_NAME at _options}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/xmltooling.git