X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=opensaml.spec.in;h=67c41aec1edf13adf86d77f94618eee330fe3969;hb=3654400391293dea962369965a26ae2023a61f37;hp=abb5d0b8801bbec31f9bb11400658583bf01f175;hpb=02559f727995a3958936106a80c54a4b0a723f21;p=shibboleth%2Fcpp-opensaml.git diff --git a/opensaml.spec.in b/opensaml.spec.in index abb5d0b..67c41ae 100644 --- a/opensaml.spec.in +++ b/opensaml.spec.in @@ -2,26 +2,25 @@ Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ Release: 1 Summary: OpenSAML SAML library -Group: System Environment/Libraries +Group: Development/Libraries/C and C++ Vendor: Internet2 License: Apache 2.0 URL: http://www.opensaml.org/ Source0: %{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 +%endif BuildRequires: libxml-security-c-devel >= 1.4.0 -BuildRequires: libxmltooling-devel >= 1.3 +BuildRequires: libxmltooling-devel >= 1.4 %{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0} %{!?_with_log4cpp:BuildRequires: liblog4shib-devel} -%else -BuildRequires: xerces%{?xercesver}-c-devel >= 2.8.0 -BuildRequires: xml-security-c-devel >= 1.4.0 -BuildRequires: xmltooling-devel >= 1.3 -%{?_with_log4cpp:BuildRequires: log4cpp-devel >= 1.0} -%{!?_with_log4cpp:BuildRequires: log4shib-devel} -%endif BuildRequires: gcc-c++ +%if 0%{?suse_version} > 1000 +BuildRequires: pkg-config +%endif %{!?_without_doxygen:BuildRequires: doxygen} %if "%{_vendor}" == "redhat" BuildRequires: redhat-rpm-config @@ -38,54 +37,63 @@ OpenSAML is an open source implementation of the OASIS Security Assertion Markup Language Specification. It contains a set of open source C++ classes that support the SAML 1.0, 1.1, and 2.0 specifications. -%if 0%{?suse_version} > 1030 -%package -n libsaml7 +%package -n @PACKAGE_NAME@-bin +Summary: Utilities for OpenSAML library +Group: Development/Libraries/C and C++ + +%description -n @PACKAGE_NAME@-bin +OpenSAML is an open source implementation of the OASIS Security Assertion +Markup Language Specification. It contains a set of open source C++ classes +that support the SAML 1.0, 1.1, and 2.0 specifications. + +This package contains the utility programs. + +%package -n libsaml8 Summary: OpenSAML SAML library -Group: Development/Libraries -Provides: @PACKAGE_NAME@ = %{version} +Group: Development/Libraries/C and C++ +Provides: @PACKAGE_NAME@ = %{version}-%{release} +Obsoletes: @PACKAGE_NAME@ < %{version}-%{release} -%description -n libsaml7 +%description -n libsaml8 OpenSAML is an open source implementation of the OASIS Security Assertion Markup Language Specification. It contains a set of open source C++ classes that support the SAML 1.0, 1.1, and 2.0 specifications. This package contains just the shared library. -%endif -%if 0%{?suse_version} > 1030 %package -n libsaml-devel -Requires: libsaml7 = %version +Summary: OpenSAML development Headers +Group: Development/Libraries/C and C++ +Requires: libsaml8 = %{version}-%{release} +Provides: @PACKAGE_NAME@-devel = %{version}-%{release} +Obsoletes: @PACKAGE_NAME@-devel < %{version}-%{release} +%if 0%{?suse_version} > 1030 && 0%{?suse_version} < 1130 +BuildRequires: libXerces-c-devel >= 2.8.0 %else -%package devel -Requires: %name = %version +BuildRequires: libxerces-c-devel >= 2.8.0 %endif -Summary: OpenSAML development Headers -Group: Development/Libraries -%if 0%{?suse_version} > 1030 -Requires: libXerces-c-devel >= 2.8.0 Requires: libxml-security-c-devel >= 1.4.0 -Requires: libxmltooling-devel >= 1.3 +Requires: libxmltooling-devel >= 1.4 %{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0} %{!?_with_log4cpp:Requires: liblog4shib-devel} -%else -Requires: xerces%{?xercesver}-c-devel >= 2.8.0 -Requires: xml-security-c-devel >= 1.4.0 -Requires: xmltooling-devel >= 1.3 -%{?_with_log4cpp:Requires: log4cpp-devel >= 1.0} -%{!?_with_log4cpp:Requires: log4shib-devel} -%endif -%if 0%{?suse_version} > 1030 %description -n libsaml-devel -%else -%description devel -%endif OpenSAML is an open source implementation of the OASIS Security Assertion Markup Language Specification. It contains a set of open source C++ classes that support the SAML 1.0, 1.1, and 2.0 specifications. This package includes files needed for development with OpenSAML. +%package -n @PACKAGE_NAME@-schemas +Summary: OpenSAML schemas and catalog +Group: Development/Libraries/C and C++ + +%description -n @PACKAGE_NAME@-schemas +OpenSAML is an open source implementation of the OASIS Security Assertion +Markup Language Specification. It contains a set of open source C++ classes +that support the SAML 1.0, 1.1, and 2.0 specifications. + +This package includes XML schemas and related files. %prep %setup -q @@ -106,37 +114,27 @@ This package includes files needed for development with OpenSAML. [ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT %ifnos solaris2.8 solaris2.9 solaris2.10 -%if 0%{?suse_version} > 1030 -%post -n libsaml7 -p /sbin/ldconfig -%else -%post -p /sbin/ldconfig -%endif +%post -n libsaml8 -p /sbin/ldconfig %endif %ifnos solaris2.8 solaris2.9 solaris2.10 -%if 0%{?suse_version} > 1030 -%postun -n libsaml7 -p /sbin/ldconfig -%else -%postun -p /sbin/ldconfig -%endif +%postun -n libsaml8 -p /sbin/ldconfig %endif -%files +%files -n @PACKAGE_NAME@-bin %defattr(-,root,root,-) %{_bindir}/samlsign -%if 0%{?suse_version} > 1030 -%files -n libsaml7 + +%files -n libsaml8 %defattr(-,root,root,-) -%endif %{_libdir}/libsaml.so.* -%dir %{_datadir}/xml/@PACKAGE_NAME@-@PACKAGE_VERSION@ -%{_datadir}/xml/@PACKAGE_NAME@-@PACKAGE_VERSION@/* -%if 0%{?suse_version} > 1030 +%files -n @PACKAGE_NAME@-schemas +%defattr(-,root,root,-) +%dir %{_datadir}/xml/@PACKAGE_NAME@ +%{_datadir}/xml/@PACKAGE_NAME@/* + %files -n libsaml-devel -%else -%files devel -%endif %defattr(-,root,root,-) %{_includedir}/* %{_libdir}/*.so @@ -144,8 +142,15 @@ This package includes files needed for development with OpenSAML. %doc %{pkgdocdir} %changelog -* Fri Dec 25 2009 Scott Cantor - 2.4-1 +* Mon Aug 8 2011 Scott Cantor - 2.5-1 +- Update lib package number. + +* Tue Oct 26 2010 Scott Cantor - 2.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 - 2.3-1 - Bump soname for SUSE packaging.