X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=opensaml.spec.in;h=b7c3d27de7abeaaf73671d39d379f06373d9e654;hb=ef3427d41ef3586b82fa44fcd3582813f1074440;hp=e7eb7ee668d59a68634b8e5e8a3f9f8531e43d87;hpb=f010f9f78102b249b987e90b7adec4192805ec93;p=shibboleth%2Fcpp-opensaml.git

diff --git a/opensaml.spec.in b/opensaml.spec.in
index e7eb7ee..b7c3d27 100644
--- a/opensaml.spec.in
+++ b/opensaml.spec.in
@@ -1,14 +1,14 @@
 Name:		@PACKAGE_NAME@
 Version:	@PACKAGE_VERSION@
 Release:	1
-Summary:    OpenSAML SAML library
-Group:		System Environment/Libraries
-Vendor:		Internet2
+Summary:	OpenSAML SAML library
+Group:		Development/Libraries/C and C++
+Vendor:		Shibboleth Consortium
 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
@@ -16,8 +16,11 @@ BuildRequires:  libxerces-c-devel >= 2.8.0
 BuildRequires:  libxml-security-c-devel >= 1.4.0
 BuildRequires:  libxmltooling-devel >= 1.4
 %{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
-%{!?_with_log4cpp:BuildRequires: liblog4shib-devel}
-BuildRequires:  gcc-c++
+%{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 1.0.4}
+BuildRequires:  gcc-c++, boost-devel >= 1.32.0
+%if 0%{?suse_version} > 1000
+BuildRequires: pkg-config
+%endif
 %{!?_without_doxygen:BuildRequires: doxygen}
 %if "%{_vendor}" == "redhat"
 BuildRequires: redhat-rpm-config
@@ -36,7 +39,7 @@ that support the SAML 1.0, 1.1, and 2.0 specifications.
 
 %package -n @PACKAGE_NAME@-bin
 Summary:    Utilities for OpenSAML library
-Group:      Development/Libraries
+Group:      Development/Libraries/C and C++
 
 %description -n @PACKAGE_NAME@-bin
 OpenSAML is an open source implementation of the OASIS Security Assertion
@@ -45,13 +48,13 @@ that support the SAML 1.0, 1.1, and 2.0 specifications.
 
 This package contains the utility programs.
 
-%package -n libsaml7
+%package -n libsaml8
 Summary:    OpenSAML SAML 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}
 
-%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.
@@ -60,11 +63,11 @@ This package contains just the shared library.
 
 %package -n libsaml-devel
 Summary:	OpenSAML development Headers
-Group:		Development/Libraries
-Requires:	libsaml7 = %version
-Provides:	@PACKAGE_NAME@-devel = %{version}
-Obsoletes:	@PACKAGE_NAME@-devel
-%if 0%{?suse_version} > 1030
+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
 BuildRequires:  libxerces-c-devel >= 2.8.0
@@ -72,7 +75,7 @@ BuildRequires:  libxerces-c-devel >= 2.8.0
 Requires: libxml-security-c-devel >= 1.4.0
 Requires: libxmltooling-devel >= 1.4
 %{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0}
-%{!?_with_log4cpp:Requires: liblog4shib-devel}
+%{!?_with_log4cpp:Requires: liblog4shib-devel >= 1.0.4}
 
 %description -n libsaml-devel
 OpenSAML is an open source implementation of the OASIS Security Assertion
@@ -83,7 +86,7 @@ This package includes files needed for development with OpenSAML.
 
 %package -n @PACKAGE_NAME@-schemas
 Summary:	OpenSAML schemas and catalog
-Group:		Development/Libraries
+Group:		Development/Libraries/C and C++
 
 %description -n @PACKAGE_NAME@-schemas
 OpenSAML is an open source implementation of the OASIS Security Assertion
@@ -111,18 +114,18 @@ 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 libsaml7 -p /sbin/ldconfig
+%post -n libsaml8 -p /sbin/ldconfig
 %endif
 
 %ifnos solaris2.8 solaris2.9 solaris2.10
-%postun -n libsaml7 -p /sbin/ldconfig
+%postun -n libsaml8 -p /sbin/ldconfig
 %endif
 
 %files -n @PACKAGE_NAME@-bin
 %defattr(-,root,root,-)
 %{_bindir}/samlsign
 
-%files -n libsaml7
+%files -n libsaml8
 %defattr(-,root,root,-)
 %{_libdir}/libsaml.so.*
 
@@ -139,9 +142,16 @@ This package includes XML schemas and related files.
 %doc %{pkgdocdir}
 
 %changelog
-* Fri Dec 25 2009   Scott Cantor  <cantor.2@osu.edu>  - 2.4-1
+* Wed Dec 14 2011 Scott Cantor  <cantor.2@osu.edu>  - 2.5-1
+- Update lib package number.
+- Add boost-devel dependency.
+
+* Tue Oct 26 2010  Scott Cantor  <cantor.2@osu.edu>  - 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  <cantor.2@osu.edu>  - 2.3-1
 - Bump soname for SUSE packaging.