From d6775556a155c50092e88825391293bd57fcab4f Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Thu, 11 Oct 2012 14:24:26 +0800 Subject: [PATCH] Spec cleanups - remaining cleanups from merge bug rhbz#226079 - do not put the docs in the main package, only in -devel rhbz#864731 --- libxml2.spec | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/libxml2.spec b/libxml2.spec index 6a37f1f..41a0421 100644 --- a/libxml2.spec +++ b/libxml2.spec @@ -1,7 +1,7 @@ Summary: Library providing XML and HTML support Name: libxml2 Version: 2.9.0 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} License: MIT Group: Development/Libraries Source: ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz @@ -17,7 +17,7 @@ this includes parsing and validation even with complex DtDs, either at parse time or later once the document has been modified. The output can be a simple SAX stream or and in-memory DOM like representations. In this case one can use the built-in XPath and XPointer implementation -to select subnodes or ranges. A flexible Input/Output mechanism is +to select sub nodes or ranges. A flexible Input/Output mechanism is available, with existing HTTP and FTP modules and combined to an URI library. @@ -37,7 +37,7 @@ this includes parsing and validation even with complex DtDs, either at parse time or later once the document has been modified. The output can be a simple SAX stream or and in-memory DOM like representations. In this case one can use the built-in XPath and XPointer implementation -to select subnodes or ranges. A flexible Input/Output mechanism is +to select sub nodes or ranges. A flexible Input/Output mechanism is available, with existing HTTP and FTP modules and combined to an URI library. @@ -72,18 +72,25 @@ at parse time or later once the document has been modified. %build %configure make %{_smp_mflags} -gzip -9 ChangeLog %install rm -fr %{buildroot} -%makeinstall -gzip -9 doc/libxml2-api.xml -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +make install DESTDIR=%{buildroot} # multiarch crazyness on timestamp differences or Makefile/binaries for examples touch -m --reference=$RPM_BUILD_ROOT/%{_includedir}/libxml2/libxml/parser.h $RPM_BUILD_ROOT/%{_bindir}/xml2-config + +%check +make check + +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.a +rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la +rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libxml2-%{version}/* +rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libxml2-python-%{version}/* (cd doc/examples ; make clean ; rm -rf .deps Makefile) +gzip -9 doc/libxml2-api.xml %clean rm -fr %{buildroot} @@ -95,7 +102,7 @@ rm -fr %{buildroot} %files %defattr(-, root, root) -%doc AUTHORS ChangeLog.gz NEWS README Copyright TODO +%doc AUTHORS NEWS README Copyright TODO %doc %{_mandir}/man1/xmllint.1* %doc %{_mandir}/man1/xmlcatalog.1* %doc %{_mandir}/man3/libxml.3* @@ -108,7 +115,7 @@ rm -fr %{buildroot} %defattr(-, root, root) %doc %{_mandir}/man1/xml2-config.1* -%doc AUTHORS ChangeLog.gz NEWS README Copyright +%doc AUTHORS NEWS README Copyright %doc doc/*.html doc/html doc/*.gif doc/*.png %doc doc/tutorial doc/libxml2-api.xml.gz %doc doc/examples @@ -143,6 +150,10 @@ rm -fr %{buildroot} %doc doc/python.html %changelog +* Thu Oct 11 2012 Daniel Veillard - 2.9.0-2 +- remaining cleanups from merge bug rhbz#226079 +- do not put the docs in the main package, only in -devel rhbz#864731 + * Tue Sep 11 2012 Daniel Veillard - 2.9.0-1 - upstream release of 2.9.0 - A few new API entry points