X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltooling.spec.in;h=a29a849cb5dd8ca45ba7e1af4c282c272496c28b;hb=cdd4b35118298bf5e0a16f3c5c4a31bf3d25271b;hp=07f884eb4a99320f3caf238764b8072def7e74dc;hpb=76d16f3878f54e8c8e20148cf6d06dac062b042e;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/xmltooling.spec.in b/xmltooling.spec.in
index 07f884e..a29a849 100644
--- a/xmltooling.spec.in
+++ b/xmltooling.spec.in
@@ -1,4 +1,4 @@
-Name:		@PACKAGE@
+Name:		@PACKAGE_NAME@
 Version:	@PACKAGE_VERSION@
 Release:	1
 Summary:    OpenSAML XMLTooling library
@@ -10,15 +10,12 @@ Source:	    %{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
 %{?_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
-%{?_with_log4cpp:BuildRequires: log4cpp-devel >= 1.0}
-%{!?_with_log4cpp:BuildRequires: log4shib-devel}
-%endif
 BuildRequires:	gcc-c++, openssl-devel, curl-devel >= 7.10.6
 %{!?_without_doxygen:BuildRequires: doxygen}
 %if "%{_vendor}" == "redhat"
@@ -38,13 +35,13 @@ for declaring element- and type-specific API and implementation
 classes to add value around the DOM, as well as signing and encryption
 support.
 
-%if 0%{?suse_version} > 1030
-%package -n lib@PACKAGE@4
+%package -n lib@PACKAGE_NAME@5
 Summary:    OpenSAML XMLTooling library
 Group:      Development/Libraries
-Provides:   @PACKAGE@ = %{version}
+Provides:   @PACKAGE_NAME@ = %{version}
+Obsoletes:  @PACKAGE_NAME@
 
-%description -n lib@PACKAGE@4
+%description -n lib@PACKAGE_NAME@5
 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,35 +49,24 @@ classes to add value around the DOM, as well as signing and encryption
 support.
 
 This package contains just the shared library.
-%endif
 
+%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
-%package -n lib@PACKAGE@-devel
-Requires: lib@PACKAGE@4 = %version
+Requires:  libXerces-c-devel >= 2.8.0
 %else
-%package devel
-Requires: %name = %version
+Requires:  libxerces-c-devel >= 2.8.0
 %endif
-Summary: XMLTooling 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
 %{?_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
-%{?_with_log4cpp:Requires: log4cpp-devel >= 1.0}
-%{!?_with_log4cpp:Requires: log4shib-devel}
-%endif
 Requires: openssl-devel, curl-devel >= 7.10.6
 
-%if 0%{?suse_version} > 1030
-%description -n lib@PACKAGE@-devel
-%else
-%description devel
-%endif
+%description -n lib@PACKAGE_NAME@-devel
 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
@@ -89,17 +75,30 @@ support.
 
 This package includes files needed for development with XMLTooling.
 
+%package -n @PACKAGE_NAME@-schemas
+Summary:	XMLTooling schemas and catalog
+Group:		Development/Libraries
+
+%description -n @PACKAGE_NAME@-schemas
+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
+classes to add value around the DOM, as well as signing and encryption
+support.
+
+This package includes XML schemas and related files.
+
 %prep
 %setup -q
 
 %build
-%configure %{?@PACKAGE@_options}
+%configure %{?@PACKAGE_NAME@_options}
 %{__make}
 
 %install
 %{__make} install DESTDIR=$RPM_BUILD_ROOT pkgdocdir=%{pkgdocdir}
 # Don't package unit tester if present.
-%{__rm} -f $RPM_BUILD_ROOT/%{_bindir}/@PACKAGE@test
+%{__rm} -f $RPM_BUILD_ROOT/%{_bindir}/@PACKAGE_NAME@test
 
 %check
 %{__make} check
@@ -108,42 +107,34 @@ This package includes files needed for development with XMLTooling.
 [ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
 
 %ifnos solaris2.8 solaris2.9 solaris2.10
-%if 0%{?suse_version} > 1030
-%post -n lib@PACKAGE@4 -p /sbin/ldconfig
-%else
-%post -p /sbin/ldconfig
-%endif
+%post -n lib@PACKAGE_NAME@5 -p /sbin/ldconfig
 %endif
 
 %ifnos solaris2.8 solaris2.9 solaris2.10
-%if 0%{?suse_version} > 1030
-%postun -n lib@PACKAGE@4 -p /sbin/ldconfig
-%else
-%postun -p /sbin/ldconfig
-%endif
+%postun -n lib@PACKAGE_NAME@5 -p /sbin/ldconfig
 %endif
 
-%if 0%{?suse_version} > 1030
-%files -n lib@PACKAGE@4
-%else
-%files
-%endif
+%files -n lib@PACKAGE@5
 %defattr(-,root,root,-)
 %{_libdir}/*.so.*
-%dir %{_datadir}/xml/@PACKAGE@
-%{_datadir}/xml/@PACKAGE@/*
 
-%if 0%{?suse_version} > 1030
-%files -n lib@PACKAGE@-devel
-%else
-%files devel
-%endif
+%files -n @PACKAGE_NAME@-schemas
+%defattr(-,root,root,-)
+%dir %{_datadir}/xml/@PACKAGE_NAME@
+%{_datadir}/xml/@PACKAGE_NAME@/*
+
+%files -n lib@PACKAGE_NAME@-devel
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/@PACKAGE_NAME@.pc
 %doc %{pkgdocdir}
 
 %changelog
+* Thu Dec 24 2009  Scott Cantor  <cantor.2@osu.edu>  - 1.4-1
+- Add pkg-config support.
+- Sync package names for side by side install.
+
 * Mon Aug 31 2009  Scott Cantor  <cantor.2@osu.edu>  - 1.3-1
 - Bump soname for SUSE packaging.