Remove even more curl-openssl

[shibboleth/xmltooling.git] / xmltooling.spec.in

diff --git a/xmltooling.spec.in b/xmltooling.spec.in
index c43f2a9..309ab9d 100644 (file)
--- a/xmltooling.spec.in
+++ b/xmltooling.spec.in
@@ -16,13 +16,8 @@ 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
-%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
-BuildRequires: libcurl-openssl-devel >= 7.21.7
-Requires: libcurl-openssl >= 7.21.7
-%else
+BuildRequires: gcc-c++, openssl-devel, boost-devel >= 1.32.0
 BuildRequires: curl-devel >= 7.10.6
-%endif
 %if 0%{?suse_version} > 1000
 BuildRequires: pkg-config
 %endif
@@ -37,11 +32,6 @@ BuildRequires: redhat-rpm-config
 %define pkgdocdir %{_docdir}/%{name}-%{version}
 %endif
 
-# Prevent the RH6 package from requiring a vanilla libcurl.
-%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
-%filter_from_requires /libcurl\.so\..*/d
-%filter_setup
-%endif
 
 %description
 The XMLTooling library contains generic XML parsing and processing
@@ -55,9 +45,6 @@ Summary:    OpenSAML XMLTooling library
 Group:      Development/Libraries/C and C++
 Provides:   @PACKAGE_NAME@ = %{version}-%{release}
 Obsoletes:  @PACKAGE_NAME@ < %{version}-%{release}
-%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
-Requires: libcurl-openssl >= 7.21.7
-%endif
 
 %description -n lib@PACKAGE_NAME@6
 The XMLTooling library contains generic XML parsing and processing
@@ -82,12 +69,8 @@ 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
-%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
-Requires: libcurl-openssl-devel >= 7.21.7
-%else
+Requires: openssl-devel, boost-devel >= 1.32.0
 Requires: curl-devel >= 7.10.6
-%endif
 
 %description -n lib@PACKAGE_NAME@-devel
 The XMLTooling library contains generic XML parsing and processing
@@ -115,11 +98,7 @@ This package includes XML schemas and related files.
 %setup -q
 
 %build
-%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
-%configure %{?@PACKAGE_NAME@_options} --with-curl=/opt/shibboleth
-%else
 %configure %{?@PACKAGE_NAME@_options}
-%endif
 %{__make}
 
 %install
@@ -134,14 +113,14 @@ This package includes XML schemas and related files.
 [ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
 
 %ifnos solaris2.8 solaris2.9 solaris2.10
-%post -n lib@PACKAGE_NAME@5 -p /sbin/ldconfig
+%post -n lib@PACKAGE_NAME@6 -p /sbin/ldconfig
 %endif
 
 %ifnos solaris2.8 solaris2.9 solaris2.10
-%postun -n lib@PACKAGE_NAME@5 -p /sbin/ldconfig
+%postun -n lib@PACKAGE_NAME@6 -p /sbin/ldconfig
 %endif
 
-%files -n lib@PACKAGE@6
+%files -n lib@PACKAGE_NAME@6
 %defattr(-,root,root,-)
 %{_libdir}/*.so.*
 
@@ -158,8 +137,9 @@ This package includes XML schemas and related files.
 %doc %{pkgdocdir}
 
 %changelog
-* Mon Aug 8 2011 Scott Cantor  <cantor.2@osu.edu>  - 1.5-1
+* Wed Dec 14 2011 Scott Cantor  <cantor.2@osu.edu>  - 1.5-1
 - Update lib package number.
+- Add boost-devel dependency.
 
 * Sun Jun 26 2011  Scott Cantor  <cantor.2@osu.edu>  - 1.4.2-1
 - Override curl build for RHEL6.