rpms/libxml2/F-8 libxml2-multilib.patch, NONE, 1.1 libxml2.spec, 1.53, 1.54 sources, 1.43, 1.44 multilib.patch, 1.1, NONE

[Daniel Veillard]

Author: veillard

Update of /cvs/pkgs/rpms/libxml2/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16325

Modified Files:
	libxml2.spec sources 
Added Files:
	libxml2-multilib.patch 
Removed Files:
	multilib.patch 
Log Message:
- new release 2.7.2
- Fixes the known problems in 2.7.1
- increase the set of options when saving documents
daniel


libxml2-multilib.patch:

--- NEW FILE libxml2-multilib.patch ---
*** XML/xml2-config.in.orig	2006-06-06 16:35:56.000000000 +0200
--- XML/xml2-config.in	2006-06-06 16:36:24.000000000 +0200
***************
*** 3,9 ****
  prefix=@prefix@
  exec_prefix=@exec_prefix@
  includedir=@includedir@
! libdir=@libdir@
  
  usage()
  {
--- 3,14 ----
  prefix=@prefix@
  exec_prefix=@exec_prefix@
  includedir=@includedir@
! if [ "`ldd /bin/sh | grep lib64`" = "" ]
! then
!     libdir=${exec_prefix}/lib
! else
!     libdir=${exec_prefix}/lib64
! fi
  
  usage()
  {


Index: libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/F-8/libxml2.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- libxml2.spec	2 Oct 2008 21:05:32 -0000	1.53
+++ libxml2.spec	7 Oct 2008 15:27:50 -0000	1.54
@@ -1,17 +1,14 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
-Version: 2.7.1
-Release: 2%{?dist}%{?extra_release}
+Version: 2.7.2
+Release: 1%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: python python-devel zlib-devel
 URL: http://xmlsoft.org/
-Prefix: %{_prefix}
-Docdir: %{_docdir}
-Patch0: multilib.patch
-Patch1: predefined_entity.patch
+Patch0: libxml2-multilib.patch
 
 %description
 This library allows to manipulate XML files. It includes support 
@@ -43,6 +40,15 @@
 available, with existing HTTP and FTP modules and combined to an
 URI library.
 
+%package static
+Summary: Static library for libxml2
+Group: Development/Libraries
+Requires: libxml2 = %{version}-%{release}
+
+%description static
+Static library for libxml2 provided for specific uses or shaving a few
+microseconds when parsing, do not link to them for generic purpose packages.
+
 %package python
 Summary: Python bindings for the libxml2 library
 Group: Development/Libraries
@@ -61,29 +67,29 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
 
 %build
 %configure
-make
+make %{_smp_mflags}
 gzip -9 ChangeLog
 
 %install
 rm -fr %{buildroot}
 
 %makeinstall
-(cd doc/examples ; make clean ; rm -rf .deps)
 gzip -9 doc/libxml2-api.xml
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
+# 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
+(cd doc/examples ; make clean ; rm -rf .deps Makefile)
+
 %clean
 rm -fr %{buildroot}
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-, root, root)
@@ -94,14 +100,13 @@
 %doc %{_mandir}/man3/libxml.3*
 
 %{_libdir}/lib*.so.*
-%{prefix}/bin/xmllint
-%{prefix}/bin/xmlcatalog
+%{_bindir}/xmllint
+%{_bindir}/xmlcatalog
 
 %files devel
 %defattr(-, root, root)
 
 %doc %{_mandir}/man1/xml2-config.1*
-%doc AUTHORS ChangeLog.gz NEWS README Copyright TODO
 %doc doc/*.html doc/html doc/*.gif doc/*.png
 %doc doc/tutorial doc/libxml2-api.xml.gz
 %doc doc/examples
@@ -112,16 +117,20 @@
 %doc %{_datadir}/gtk-doc/html/libxml2/*.css
 
 %{_libdir}/lib*.so
-%{_libdir}/*a
 %{_libdir}/*.sh
-%{prefix}/include/*
-%{prefix}/bin/xml2-config
-%{prefix}/share/aclocal/libxml.m4
+%{_includedir}/*
+%{_bindir}/xml2-config
+%{_datadir}/aclocal/libxml.m4
 %{_libdir}/pkgconfig/libxml-2.0.pc
+
+%files static
+%defattr(-, root, root)
+
+%{_libdir}/*a
+
 %files python
 %defattr(-, root, root)
 
-%doc AUTHORS ChangeLog.gz NEWS README Copyright
 %{_libdir}/python*/site-packages/libxml2.py*
 %{_libdir}/python*/site-packages/drv_libxml2.py*
 %{_libdir}/python*/site-packages/libxml2mod*
@@ -132,6 +141,11 @@
 %doc doc/python.html
 
 %changelog
+* Tue Oct  7 2008 Daniel Veillard <veillard at redhat.com> 2.7.2-1.fc8
+- new release 2.7.2
+- Fixes the known problems in 2.7.1
+- increase the set of options when saving documents
+
 * Thu Oct  2 2008 Daniel Veillard <veillard at redhat.com> 2.7.1-2.fc8
 - fix a nasty bug in 2.7.x, http://bugzilla.gnome.org/show_bug.cgi?id=554660
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/F-8/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	1 Sep 2008 16:01:26 -0000	1.43
+++ sources	7 Oct 2008 15:27:50 -0000	1.44
@@ -1 +1 @@
-abc093e9ac7ea1aabf37982ae9df6d6c  libxml2-2.7.1.tar.gz
+dc43ff7ae6aded45f578c87b7b0c8766  libxml2-2.7.2.tar.gz


--- multilib.patch DELETED ---