X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltooling.spec.in;h=192188942fecd7b2e06524afd49a139948f3305d;hb=fccf71cd8cd6e95335726fb60505e3236f0459fe;hp=ec69109e7ae062f52a984445ccc6e059358796d4;hpb=075fb402633832c9938654672012cb523bac2259;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/xmltooling.spec.in b/xmltooling.spec.in
index ec69109..1921889 100644
--- a/xmltooling.spec.in
+++ b/xmltooling.spec.in
@@ -2,13 +2,13 @@ Name:		@PACKAGE_NAME@
 Version:	@PACKAGE_VERSION@
 Release:	1
 Summary:    OpenSAML XMLTooling library
-Group:		System Environment/Libraries
+Group:		Development/Libraries/C and C++
 Vendor:		Internet2
 License:	Apache 2.0
 URL:		http://www.opensaml.org/
 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
@@ -37,9 +37,9 @@ support.
 
 %package -n lib@PACKAGE_NAME@5
 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}
 
 %description -n lib@PACKAGE_NAME@5
 The XMLTooling library contains generic XML parsing and processing
@@ -52,11 +52,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@5 = %{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
@@ -77,7 +77,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
@@ -119,6 +119,7 @@ This package includes XML schemas and related files.
 %{_libdir}/*.so.*
 
 %files -n @PACKAGE_NAME@-schemas
+%defattr(-,root,root,-)
 %dir %{_datadir}/xml/@PACKAGE_NAME@
 %{_datadir}/xml/@PACKAGE_NAME@/*
 
@@ -130,9 +131,12 @@ This package includes XML schemas and related files.
 %doc %{pkgdocdir}
 
 %changelog
-* Thu Dec 24 2009  Scott Cantor  <cantor.2@osu.edu>  - 1.4-1
+* Tue Oct 26 2010  Scott Cantor  <cantor.2@osu.edu>  - 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  <cantor.2@osu.edu>  - 1.3-1
 - Bump soname for SUSE packaging.