New upstream release of libxml2.

diff --git a/.hgignore b/.hgignore
index 91cbcfd..c1bd970 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -35,6 +35,7 @@ libvirt/libvirt-0.4.5.tar.gz
 libvirt/libvirt-0.4.6.tar.gz
 libxml2/libxml2-2.6.32.tar.gz
 libxml2/libxml2-2.7.1.tar.gz
+libxml2/libxml2-2.7.2.tar.gz
 nsis/nsis-2.19-src.tar.bz2
 nsis/nsis-2.39-src.tar.bz2
 nsiswrapper/installer.exe

diff --git a/libxml2/libxml2-multilib.patch b/libxml2/libxml2-multilib.patch
new file mode 100644 (file)
index 0000000..138d38f
--- /dev/null
+++ b/libxml2/libxml2-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()
+  {

diff --git a/libxml2/mingw32-libxml2.spec b/libxml2/mingw32-libxml2.spec
index da3fa27..0fc3ae3 100644 (file)
--- a/libxml2/mingw32-libxml2.spec
+++ b/libxml2/mingw32-libxml2.spec
@@ -5,8 +5,8 @@
 %define __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-libxml2
-Version:        2.7.1
-Release:        2%{?dist}
+Version:        2.7.2
+Release:        1%{?dist}
 Summary:        MinGW Windows libxml2 XML processing library
 
 License:        MIT
@@ -15,6 +15,9 @@ URL:            http://xmlsoft.org/
 Source0:        ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# Not required for MinGW.
+#Patch0:         libxml2-multilib.patch
+
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 23
@@ -70,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 17 2008 Richard W.M. Jones <rjones@redhat.com> - 2.7.2-1
+- Resynch to native Fedora package + patch.
+
 * Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 2.7.1-2
 - Rename mingw -> mingw32.