X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-xmltooling.git;a=blobdiff_plain;f=xmltooling.spec.in;h=b8f5f8d8e48f715a426848134dabbce00afa203b;hp=192188942fecd7b2e06524afd49a139948f3305d;hb=HEAD;hpb=fccf71cd8cd6e95335726fb60505e3236f0459fe diff --git a/xmltooling.spec.in b/xmltooling.spec.in index 1921889..b8f5f8d 100644 --- a/xmltooling.spec.in +++ b/xmltooling.spec.in @@ -1,22 +1,31 @@ Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ Release: 1 -Summary: OpenSAML XMLTooling library +Summary: OpenSAML XMLTooling library Group: Development/Libraries/C and C++ -Vendor: Internet2 +Vendor: Shibboleth Consortium License: Apache 2.0 URL: http://www.opensaml.org/ -Source: %{name}-%{version}.tar.gz +Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-root -%if 0%{?suse_version} > 1030 && 0%{?suse_version} < 1130 -BuildRequires: libXerces-c-devel >= 2.8.0 +%if 0%{?rhel} >= 7 || 0%{?centos_version} >= 700 +BuildRequires: xerces-c-devel >= 3.1 %else -BuildRequires: libxerces-c-devel >= 2.8.0 +BuildRequires: libxerces-c-devel >= 3.1 %endif -BuildRequires: libxml-security-c-devel >= 1.4.0 +BuildRequires: libxml-security-c-devel >= 1.7.3 %{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0} -%{!?_with_log4cpp:BuildRequires: liblog4shib-devel} -BuildRequires: gcc-c++, openssl-devel, curl-devel >= 7.10.6 +%{!?_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 || 0%{?amzn} >= 1 +BuildRequires: libcurl-openssl-devel >= 7.21.7 +Requires: libcurl-openssl >= 7.21.7 +%else +BuildRequires: curl-devel >= 7.10.6 +%endif +%if 0%{?suse_version} > 1000 +BuildRequires: pkg-config +%endif %{!?_without_doxygen:BuildRequires: doxygen} %if "%{_vendor}" == "redhat" BuildRequires: redhat-rpm-config @@ -28,6 +37,12 @@ BuildRequires: redhat-rpm-config %define pkgdocdir %{_docdir}/%{name}-%{version} %endif +# Prevent the RHEL/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 + %description The XMLTooling library contains generic XML parsing and processing classes based on the Xerces-C DOM. It adds more powerful facilities @@ -35,13 +50,16 @@ for declaring element- and type-specific API and implementation classes to add value around the DOM, as well as signing and encryption support. -%package -n lib@PACKAGE_NAME@5 +%package -n lib@PACKAGE_NAME@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 || 0%{?amzn} >= 1 +Requires: libcurl-openssl >= 7.21.7 +%endif -%description -n lib@PACKAGE_NAME@5 +%description -n lib@PACKAGE_NAME@6 The XMLTooling library contains generic XML parsing and processing classes based on the Xerces-C DOM. It adds more powerful facilities for declaring element- and type-specific API and implementation @@ -53,18 +71,23 @@ This package contains just the shared library. %package -n lib@PACKAGE_NAME@-devel Summary: XMLTooling development Headers Group: Development/Libraries/C and C++ -Requires: lib@PACKAGE_NAME@5 = %{version}-%{release} +Requires: lib@PACKAGE_NAME@6 = %{version}-%{release} Provides: @PACKAGE_NAME@-devel = %{version}-%{release} Obsoletes: @PACKAGE_NAME@-devel < %{version}-%{release} -%if 0%{?suse_version} > 1030 && 0%{?suse_version} < 1130 -Requires: libXerces-c-devel >= 2.8.0 +%if 0%{?rhel} >= 7 || 0%{?centos_version} >= 700 +Requires: xerces-c-devel >= 3.1 %else -Requires: libxerces-c-devel >= 2.8.0 +Requires: libxerces-c-devel >= 3.1 %endif -Requires: libxml-security-c-devel >= 1.4.0 +Requires: libxml-security-c-devel >= 1.7.3 %{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0} -%{!?_with_log4cpp:Requires: liblog4shib-devel} -Requires: openssl-devel, curl-devel >= 7.10.6 +%{!?_with_log4cpp:Requires: liblog4shib-devel >= 1.0.4} +Requires: openssl-devel, boost-devel >= 1.32.0 +%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 +%endif %description -n lib@PACKAGE_NAME@-devel The XMLTooling library contains generic XML parsing and processing @@ -92,7 +115,11 @@ This package includes XML schemas and related files. %setup -q %build +%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 || 0%{?amzn} >= 1 +%configure %{?@PACKAGE_NAME@_options} --with-curl=/opt/shibboleth +%else %configure %{?@PACKAGE_NAME@_options} +%endif %{__make} %install @@ -107,14 +134,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@5 +%files -n lib@PACKAGE_NAME@6 %defattr(-,root,root,-) %{_libdir}/*.so.* @@ -131,6 +158,21 @@ This package includes XML schemas and related files. %doc %{pkgdocdir} %changelog +* Thu Feb 26 2015 Scott Cantor - 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 - 1.5.3-1.2 +- Update package dependencies for RHEL/CentOS 7 + +* Wed Dec 14 2011 Scott Cantor - 1.5-1 +- Update lib package number. +- Add boost-devel dependency. + +* Sun Jun 26 2011 Scott Cantor - 1.4.2-1 +- Override curl build for RHEL6. + * Tue Oct 26 2010 Scott Cantor - 1.4-1 - Update version - Add pkg-config support.