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:
b0d6aa1
)
Add Amazon checks to libcurl overrides
author
Scott Cantor
<cantor.2@osu.edu>
Fri, 13 Mar 2015 18:15:14 +0000
(18:15 +0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Fri, 13 Mar 2015 18:15:14 +0000
(18:15 +0000)
xmltooling.spec.in
patch
|
blob
|
history
diff --git
a/xmltooling.spec.in
b/xmltooling.spec.in
index
edb11a1
..
c60a98b
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 >= 1.0.4}
BuildRequires: gcc-c++, openssl-devel, boost-devel >= 1.32.0
%{?_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
BuildRequires: libcurl-openssl-devel >= 7.21.7
Requires: libcurl-openssl >= 7.21.7
%else
@@
-37,8
+37,8
@@
BuildRequires: redhat-rpm-config
%define pkgdocdir %{_docdir}/%{name}-%{version}
%endif
%define pkgdocdir %{_docdir}/%{name}-%{version}
%endif
-# Prevent the RH
6
package from requiring a vanilla libcurl.
-%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
+# Prevent the RH
EL/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
%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 || 0%{?centos_version} >= 600
+%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
|| 0%{?amzn} >= 1
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 >= 1.0.4}
Requires: openssl-devel, boost-devel >= 1.32.0
%{?_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
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 || 0%{?centos_version} >= 600
+%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
|| 0%{?amzn} >= 1
%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}
@@
-160,6
+160,7
@@
This package includes XML schemas and related files.
%changelog
* Thu Feb 26 2015 Scott Cantor <cantor.2@osu.edu> - 1.5.4-1
- Require Xerces 3.1 even on older platforms
%changelog
* Thu Feb 26 2015 Scott Cantor <cantor.2@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@iay.org.uk> - 1.5.3-1.2
- Switch to bz2 source to avoid future SuSE issues
* Tue May 13 2014 Ian Young <ian@iay.org.uk> - 1.5.3-1.2