X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-xmltooling.git;a=blobdiff_plain;f=xmltooling.spec.in;h=0af07ed61f1ad976099d076520f8e319d0a25b92;hp=a29a849cb5dd8ca45ba7e1af4c282c272496c28b;hb=66dde8bc216fc70d34346bff8f97c697306e9b4b;hpb=cdd4b35118298bf5e0a16f3c5c4a31bf3d25271b diff --git a/xmltooling.spec.in b/xmltooling.spec.in index a29a849..0af07ed 100644 --- a/xmltooling.spec.in +++ b/xmltooling.spec.in @@ -1,14 +1,14 @@ Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ Release: 1 -Summary: OpenSAML XMLTooling library -Group: System Environment/Libraries +Summary: OpenSAML XMLTooling library +Group: Development/Libraries/C and C++ Vendor: Internet2 License: Apache 2.0 URL: http://www.opensaml.org/ -Source: %{name}-%{version}.tar.gz +Source: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root -%if 0%{?suse_version} > 1030 +%if 0%{?suse_version} > 1030 && 0%{?suse_version} < 1130 BuildRequires: libXerces-c-devel >= 2.8.0 %else BuildRequires: libxerces-c-devel >= 2.8.0 @@ -16,7 +16,16 @@ 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, curl-devel >= 7.10.6 +BuildRequires: gcc-c++, openssl-devel, boost-devel >= 1.32.0 +%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 +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 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 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 -Provides: @PACKAGE_NAME@ = %{version} -Obsoletes: @PACKAGE_NAME@ +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@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 @@ -52,11 +70,11 @@ This package contains just the shared library. %package -n lib@PACKAGE_NAME@-devel Summary: XMLTooling development Headers -Group: Development/Libraries -Requires: lib@PACKAGE_NAME@5 = %{version} -Provides: @PACKAGE_NAME@-devel = %{version} -Obsoletes: @PACKAGE_NAME@-devel -%if 0%{?suse_version} > 1030 +Group: Development/Libraries/C and C++ +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 %else Requires: libxerces-c-devel >= 2.8.0 @@ -64,7 +82,12 @@ 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, curl-devel >= 7.10.6 +Requires: openssl-devel, boost-devel >= 1.32.0 +%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 +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 @@ -77,7 +100,7 @@ This package includes files needed for development with XMLTooling. %package -n @PACKAGE_NAME@-schemas Summary: XMLTooling schemas and catalog -Group: Development/Libraries +Group: Development/Libraries/C and C++ %description -n @PACKAGE_NAME@-schemas 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 +%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,9 +158,19 @@ This package includes XML schemas and related files. %doc %{pkgdocdir} %changelog -* Thu Dec 24 2009 Scott Cantor - 1.4-1 +* 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. - Sync package names for side by side install. +- Adjust Xerces dependency name and Group setting +- Split out schemas into separate subpackage * Mon Aug 31 2009 Scott Cantor - 1.3-1 - Bump soname for SUSE packaging.