projects
/
shibboleth
/
cpp-xmltooling.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
373e1b3
)
Add CentOS 6 workaround to specfile
author
Scott Cantor
<cantor.2@osu.edu>
Sat, 6 Aug 2011 23:58:40 +0000
(23:58 +0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Sat, 6 Aug 2011 23:58:40 +0000
(23:58 +0000)
xmltooling.spec.in
patch
|
blob
|
history
diff --git
a/xmltooling.spec.in
b/xmltooling.spec.in
index
4cfc7c9
..
9c0d847
100644
(file)
--- 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
%{?_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
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.
%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
%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}
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
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
%{?_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
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
%setup -q
%build
-%if 0%{?rhel} >= 6
+%if 0%{?rhel} >= 6
|| 0%{?centos_version} >= 600
%configure %{?@PACKAGE_NAME@_options} --with-curl=/opt/shibboleth
%else
%configure %{?@PACKAGE_NAME@_options}
%configure %{?@PACKAGE_NAME@_options} --with-curl=/opt/shibboleth
%else
%configure %{?@PACKAGE_NAME@_options}