New upstream release, trying to fix some fuckages raised in FC build,

daniel

.cvsignore

@@ -10,3 +10,4 @@ libxml2-2.6.21.tar.gz
 libxml2-2.6.22.tar.gz
 libxml2-2.6.23.tar.gz
 libxml2-2.6.24.tar.gz
+libxml2-2.6.25.tar.gz

libxml2.spec

@@ -1,6 +1,6 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
-Version: 2.6.24
+Version: 2.6.25
 Release: 1
 License: MIT
 Group: Development/Libraries
@@ -10,6 +10,7 @@ BuildRequires: python python-devel zlib-devel
 URL: http://xmlsoft.org/
 Prefix: %{_prefix}
 Docdir: %{_docdir}
+Patch0: multilib.patch
 
 %description
 This library allows to manipulate XML files. It includes support 
@@ -27,6 +28,7 @@ Summary: Libraries, includes, etc. to develop XML and HTML applications
 Group: Development/Libraries
 Requires: libxml2 = %{version}
 Requires: zlib-devel
+Requires: pkgconfig
 
 %description devel
 Libraries, include files, etc you can use to develop XML applications.
@@ -58,6 +60,7 @@ at parse time or later once the document has been modified.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -127,56 +130,6 @@ rm -fr %{buildroot}
 %doc doc/python.html
 
 %changelog
-* Fri Apr 28 2006 Daniel Veillard <veillard@redhat.com>
-- upstream release 2.6.24 see http://xmlsoft.org/news.html
-
-* Thu Jan  2 2003 Daniel Veillard <veillard@redhat.com>
-- integrated drv_libxml2 xml.sax driver from Stéphane Bidoul
-- provides the new XmlTextReader interfaces based on C# XML APIs
-
-* Wed Oct 23 2002 Daniel Veillard <veillard@redhat.com>
-- revamped the spec file, cleaned up some rpm building problems
-
-* Fri Oct  4 2002 Jeremy Katz <katzj@redhat.com>
-- build with 'make LIBTOOL=/usr/bin/libtool' to use system libtool
-
-* Wed Sep  4 2002 Daniel Veillard <veillard@redhat.com>
-
-- library paths fixed for x86-64
-
-* Fri Feb  1 2002 Daniel Veillard <veillard@redhat.com>
-
-- Added the python package
-
-* Sun Nov  4 2001 Daniel Veillard <veillard@redhat.com>
-
-- cleaned up the specfile
-- 2.4.7 broke SGML catalogs badly. this fixes it.
-
-* Thu Apr 26 2001 Toshio Kuratomi <badger@prtr-13.ucsc.edu>
-
-[2.3.7]
-- Added libxml.m4 to the distribution file list
-- Moved the man pages from /usr/man to /usr/share/man to conform to FHS2.0
-- Moved programmer documentation into the devel package
-
-* Thu Sep 23 1999 Daniel Veillard <daniel@veillard.com>
-
-- corrected the spec file alpha stuff
-- switched to version 1.7.1
-- Added validation, XPath, nanohttp, removed memory leaks
-- Renamed CHAR to xmlChar
-
-* Wed Jun  2 1999 Daniel Veillard <daniel@veillard.com>
-
-- Switched to version 1.1: SAX extensions, better entities support, lots of
-  bug fixes.
-
-* Sun Oct  4 1998 Daniel Veillard <daniel@veillard.com>
-
-- Added xml-config to the package
-
-* Thu Sep 24 1998 Michael Fulbright <msf@redhat.com>
-
-- Built release 0.30
+* Tue Jun  6 2006 Daniel Veillard <veillard@redhat.com>
+- upstream release 2.6.25 see http://xmlsoft.org/news.html
 

multilib.patch

@@ -0,0 +1,24 @@
+*** 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()
+  {

sources

@@ -1 +1,2 @@
 a0e913c13b5ddbd336fcca7104da6583  libxml2-2.6.24.tar.gz
+84ba8fd59f4e52dcd1fd368a61b3101e  libxml2-2.6.25.tar.gz