Side by side installs, and separate -schemas package.

diff --git a/opensaml.spec.in b/opensaml.spec.in
index 4460df4..e7eb7ee 100644 (file)
--- a/opensaml.spec.in
+++ b/opensaml.spec.in
@@ -10,17 +10,13 @@ Source0:    %{name}-%{version}.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 %if 0%{?suse_version} > 1030
 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++
 %{!?_without_doxygen:BuildRequires: doxygen}
 %if "%{_vendor}" == "redhat"
@@ -38,11 +34,22 @@ 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 @PACKAGE_NAME@-bin
+Summary:    Utilities for OpenSAML library
+Group:      Development/Libraries
+
+%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 libsaml7
 Summary:    OpenSAML SAML library
 Group:      Development/Libraries
 Provides:   @PACKAGE_NAME@ = %{version}
+Obsoletes:  @PACKAGE_NAME@
 
 %description -n libsaml7
 OpenSAML is an open source implementation of the OASIS Security Assertion
@@ -50,42 +57,40 @@ 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
+Requires:      libsaml7 = %version
+Provides:      @PACKAGE_NAME@-devel = %{version}
+Obsoletes:     @PACKAGE_NAME@-devel
+%if 0%{?suse_version} > 1030
+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
+
+%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 +111,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
 %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
 %endif
 
-%files
+%files -n @PACKAGE_NAME@-bin
 %defattr(-,root,root,-)
 %{_bindir}/samlsign
-%if 0%{?suse_version} > 1030
+
 %files -n libsaml7
 %defattr(-,root,root,-)
-%endif
 %{_libdir}/libsaml.so.*
+
+%files -n @PACKAGE_NAME@-schemas
+%defattr(-,root,root,-)
 %dir %{_datadir}/xml/@PACKAGE_NAME@
 %{_datadir}/xml/@PACKAGE_NAME@/*
 
-%if 0%{?suse_version} > 1030
 %files -n libsaml-devel
-%else
-%files devel
-%endif
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/*.so
@@ -146,6 +141,7 @@ This package includes files needed for development with OpenSAML.
 %changelog
 * Fri Dec 25 2009   Scott Cantor  <cantor.2@osu.edu>  - 2.4-1
 - Add pkg-config support.
+- Sync package names for side by side install.
 
 * Mon Aug 31 2009   Scott Cantor  <cantor.2@osu.edu>  - 2.3-1
 - Bump soname for SUSE packaging.