Roll back schema directory changes, didn't consider impact on upgrades.

[shibboleth/cpp-xmltooling.git] / xmltooling.spec.in

diff --git a/xmltooling.spec.in b/xmltooling.spec.in
index bdfd9a6..8b44888 100644 (file)
--- 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
@@ -21,6 +21,9 @@ BuildRequires:  xml-security-c-devel >= 1.4.0
 %endif
 BuildRequires: gcc-c++, openssl-devel, curl-devel >= 7.10.6
 %{!?_without_doxygen:BuildRequires: doxygen}
+%if "%{_vendor}" == "redhat"
+BuildRequires: redhat-rpm-config
+%endif
 
 %if "%{_vendor}" == "suse"
 %define pkgdocdir %{_docdir}/%{name}
@@ -36,12 +39,13 @@ classes to add value around the DOM, as well as signing and encryption
 support.
 
 %if 0%{?suse_version} > 1030
-%package -n lib@PACKAGE@3
+%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@3
+%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,11 +56,12 @@ This package contains just the shared library.
 %endif
 
 %if 0%{?suse_version} > 1030
-%package -n lib@PACKAGE@-devel
-Requires: lib@PACKAGE@3 = %version
+%package -n lib@PACKAGE_NAME@-devel
+Requires:   lib@PACKAGE_NAME@5 = %version
+Obsoletes:  @PACKAGE_NAME@-devel
 %else
 %package devel
-Requires: %name = %version
+Requires:   %name = %version
 %endif
 Summary: XMLTooling development Headers
 Group: Development/Libraries
@@ -74,7 +79,7 @@ Requires: xml-security-c-devel >= 1.4.0
 Requires: openssl-devel, curl-devel >= 7.10.6
 
 %if 0%{?suse_version} > 1030
-%description -n lib@PACKAGE@-devel
+%description -n lib@PACKAGE_NAME@-devel
 %else
 %description devel
 %endif
@@ -90,13 +95,13 @@ This package includes files needed for development with XMLTooling.
 %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
@@ -106,7 +111,7 @@ This package includes files needed for development with XMLTooling.
 
 %ifnos solaris2.8 solaris2.9 solaris2.10
 %if 0%{?suse_version} > 1030
-%post -n lib@PACKAGE@3 -p /sbin/ldconfig
+%post -n lib@PACKAGE_NAME@5 -p /sbin/ldconfig
 %else
 %post -p /sbin/ldconfig
 %endif
@@ -114,33 +119,40 @@ This package includes files needed for development with XMLTooling.
 
 %ifnos solaris2.8 solaris2.9 solaris2.10
 %if 0%{?suse_version} > 1030
-%postun -n lib@PACKAGE@3 -p /sbin/ldconfig
+%postun -n lib@PACKAGE_NAME@5 -p /sbin/ldconfig
 %else
 %postun -p /sbin/ldconfig
 %endif
 %endif
 
 %if 0%{?suse_version} > 1030
-%files -n lib@PACKAGE@3
+%files -n lib@PACKAGE@5
 %else
 %files
 %endif
 %defattr(-,root,root,-)
 %{_libdir}/*.so.*
-%dir %{_datadir}/xml/@PACKAGE@
-%{_datadir}/xml/@PACKAGE@/*
+%dir %{_datadir}/xml/@PACKAGE_NAME@
+%{_datadir}/xml/@PACKAGE_NAME@/*
 
 %if 0%{?suse_version} > 1030
-%files -n lib@PACKAGE@-devel
+%files -n lib@PACKAGE_NAME@-devel
 %else
 %files devel
 %endif
 %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
+
+* Mon Aug 31 2009  Scott Cantor  <cantor.2@osu.edu>  - 1.3-1
+- Bump soname for SUSE packaging.
+
 * Thu Aug 6 2009  Scott Cantor  <cantor.2@osu.edu>  - 1.2.1-1
 - SuSE conventions
 - Stop packaging unit tester