Package fixes.

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

diff --git a/xmltooling.spec.in b/xmltooling.spec.in
index af1aca2..8cac0f4 100644 (file)
--- a/xmltooling.spec.in
+++ b/xmltooling.spec.in
@@ -1,17 +1,18 @@
 Name:          xmltooling
 Summary:       Open source XMLTooling library
 Version:       @-VERSION-@
-Release:       1
+Release:       6
 Group:         System Environment/Libraries
 Vendor:                Internet2
 License:       Apache 2.0
 URL:           http://www.opensaml.org/
 Source0:       %{name}-%{version}.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
-
-BuildRequires: xerces%{?xercesver}-c-devel >= 2.6.1
-BuildRequires: xml-security-c-devel >= 1.3.1
-BuildRequires: log4cpp-devel >= 0.3.5, cxxtest, doxygen
+BuildRequires:  xerces%{?xercesver}-c-devel >= 2.8.0
+BuildRequires: xml-security-c-devel >= 1.4.0
+BuildRequires: openssl-devel, curl-devel >= 7.10.6
+%{?_with_log4cpp:BuildRequires:        log4cpp-devel >= 1.0}
+%{!?_with_log4cpp:BuildRequires: log4shib-devel}
 
 %description
 The XMLTooling library contains generic XML parsing and processing
@@ -50,34 +51,40 @@ XMLTooling Library API documentation generated by doxygen.
 
 %build
 %configure %{?xmltooling_options}
-make
+%{__make}
 
 %install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-rm -rf _docs
-make install DESTDIR=$RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT/usr/doc/xmltooling _docs
+[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT/%{_bindir} -type f |
+  %{__sed} -e "s|$RPM_BUILD_ROOT||" | sort > rpm.binlist
 
 %check || :
-make check
+%{__make} check
 
 %clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/ldconfig
+%ifnos solaris2.8 solaris2.9 solaris2.10 
+%post -p /sbin/ldconfig
+%endif
 
-%postun
-/sbin/ldconfig
+%ifnos solaris2.8 solaris2.9 solaris2.10 
+%postun -p /sbin/ldconfig
+%endif
 
-%files
+%files -f rpm.binlist
 %defattr(-,root,root,-)
-%doc _docs/LICENSE.txt _docs/NOTICE.txt
-%{_bindir}/xmltoolingtest
 %{_libdir}/libxmltooling.so.*
 %{_libdir}/libxmltooling-lite.so.*
 %dir %{_datadir}/xml/xmltooling
 %{_datadir}/xml/xmltooling
+%docdir %{_datadir}/doc/xmltooling
+%{_datadir}/doc/xmltooling/LICENSE.txt
+%{_datadir}/doc/xmltooling/NOTICE.txt
+%{_datadir}/doc/xmltooling/CURL.LICENSE
+%{_datadir}/doc/xmltooling/LOG4CPP.LICENSE
+%{_datadir}/doc/xmltooling/OPENSSL.LICENSE
 
 %files devel
 %defattr(-,root,root,-)
@@ -87,8 +94,23 @@ make check
 
 %files docs
 %defattr(644,root,root,755)
-%doc _docs/api/*
+%doc %{_datadir}/doc/xmltooling/api
 
 %changelog
+* Mon Mar 17 2008  Scott Cantor  <cantor.2@osu.edu>  - 1.0-6
+- Official release.
+
+* Fri Jan 18 2008  Scott Cantor  <cantor.2@osu.edu>  - 1.0-5
+- Release candidate 1.
+
+* Thu Nov 08 2007  Scott Cantor  <cantor.2@osu.edu>  - 1.0-4
+- Second public beta.
+
+* Thu Aug 16 2007  Scott Cantor  <cantor.2@osu.edu>  - 1.0-3
+- First public beta.
+
+* Fri Jul 13 2007  Scott Cantor  <cantor.2@osu.edu>  - 1.0-2
+- Second alpha.
+
 * Wed Apr 12 2006  Scott Cantor  <cantor.2@osu.edu>  - 1.0-1
 - First SPEC file based on various versions in existence.