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

[noreply at shibboleth.net]

Author: scantor
Date: Sat Aug  6 23:24:40 2011
New Revision: 890

URL: http://svn.shibboleth.net/view/cpp-xmltooling?rev=890&view=rev
Log:
Add CentOS 6 workaround to specfile

Modified:
    branches/REL_1_4/xmltooling.spec.in

Modified: branches/REL_1_4/xmltooling.spec.in
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1_4/xmltooling.spec.in?rev=890&r1=889&r2=890&view=diff
==============================================================================
--- branches/REL_1_4/xmltooling.spec.in (original)
+++ branches/REL_1_4/xmltooling.spec.in Sat Aug  6 23:24:40 2011
@@ -17,7 +17,7 @@
 %{?_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 @@
 %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 @@
 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 @@
 %{?_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 @@
 %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}