SPECS: libxml2.spec - up to 2.6.22

[twittner]

Author: twittner                     Date: Tue Sep 13 21:25:54 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 2.6.22

---- Files affected:
SPECS:
   libxml2.spec (1.133 -> 1.134) 

---- Diffs:

================================================================
Index: SPECS/libxml2.spec
diff -u SPECS/libxml2.spec:1.133 SPECS/libxml2.spec:1.134
--- SPECS/libxml2.spec:1.133	Mon Sep  5 14:50:47 2005
+++ SPECS/libxml2.spec	Tue Sep 13 23:25:49 2005
@@ -2,6 +2,7 @@
 #
 # Conditional build:
 %bcond_without	python	# don't build python module
+%bcond_without	static_libs # don't build static libraries
 #
 %{?with_python:%include	/usr/lib/rpm/macros.python}
 Summary:	libXML library
@@ -9,13 +10,13 @@
 Summary(pl):	Biblioteka libXML wersja 2
 Summary(pt_BR):	Biblioteca libXML versăo 2
 Name:		libxml2
-Version:	2.6.21
+Version:	2.6.22
 Release:	1
 Epoch:		1
 License:	MIT
 Group:		Libraries
 Source0:	ftp://xmlsoft.org/%{name}-%{version}.tar.gz
-# Source0-md5:	131f2d98ed75ec1dc118783a21104107
+# Source0-md5:	1db8d06b4f49a665a8f47dc6d94450e6
 Patch0:		%{name}-amfix.patch
 Patch1:		%{name}-man_fixes.patch
 Patch2:		%{name}-open.gz.patch
@@ -129,7 +130,9 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+	%{!?with_static_libs:--enable-static=no}
+	
 %{__make}
 
 %install
@@ -152,10 +155,14 @@
 
 # move html doc to -devel package
 install -d $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}
-mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html \
+mv -f $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html \
 	$RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
+# deal with gtk-doc files
+install -d $RPM_BUILD_ROOT%{_gtkdocdir}
+mv -f $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/* $RPM_BUILD_ROOT%{_gtkdocdir}
+
 # install catalog file
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/xml
 LD_LIBRARY_PATH=.libs ./xmlcatalog --create \
@@ -194,10 +201,13 @@
 %{_includedir}/libxml2
 %{_mandir}/man1/xml2-config.1*
 %{_examplesdir}/%{name}-devel-%{version}
+%{_gtkdocdir}/libxml2
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
+%endif
 
 %files progs
 %defattr(644,root,root,755)
@@ -220,6 +230,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.134  2005/09/13 21:25:49  twittner
+- up to 2.6.22
+
 Revision 1.133  2005/09/05 12:50:47  paladine
 - updated to 2.6.21
 - removed python_xmlAttr_parent patch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/libxml2.spec?r1=1.133&r2=1.134&f=u