[mingw-libxml2: 10/29] - Update to 2.7.4 - Drop upstreamed libxml2-2.7.3-ficora-parse.patch patch - Drop upstreamed mingw32

[Kalev Lember]

commit 256ef9f38642ddbd710ef1e2ff9114f08cadbb5e
Author: epienbro <epienbro at fedoraproject.org>
Date:   Fri Sep 11 16:37:19 2009 +0000

    - Update to 2.7.4
    - Drop upstreamed libxml2-2.7.3-ficora-parse.patch patch
    - Drop upstreamed mingw32-libxml2-static-build-compile-fix.patch patch
    - Added a new patch to fix compatibility with the w32 port of pthreads
    - Use %global instead of %define
    - Automatically generate debuginfo subpackage (F12 only)

 .cvsignore                                         |    2 +-
 libxml2-2.7.3-ficora-parse.patch                   |  159 --------------------
 mingw32-libxml2-static-build-compile-fix.patch     |   13 --
 mingw32-libxml2-win32-pthreads-compatibility.patch |   11 ++
 mingw32-libxml2.spec                               |   34 +++--
 sources                                            |    2 +-
 6 files changed, 35 insertions(+), 186 deletions(-)
---
diff --git a/.cvsignore b/.cvsignore
index 374863a..4c22ab6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libxml2-2.7.3.tar.gz
+libxml2-2.7.4.tar.gz
diff --git a/mingw32-libxml2-win32-pthreads-compatibility.patch b/mingw32-libxml2-win32-pthreads-compatibility.patch
new file mode 100644
index 0000000..bc965e3
--- /dev/null
+++ b/mingw32-libxml2-win32-pthreads-compatibility.patch
@@ -0,0 +1,11 @@
+--- testThreads.c.orig	2009-09-11 18:09:00.268640135 +0200
++++ testThreads.c	2009-09-11 18:12:43.412653512 +0200
+@@ -107,7 +107,7 @@
+ 
+ 	for (i = 0; i < num_threads; i++) {
+ 	    results[i] = NULL;
+-	    tid[i] = (pthread_t) -1;
++	    memset(&tid[i], 0, sizeof(pthread_t));
+ 	}
+ 
+ 	for (i = 0; i < num_threads; i++) {
diff --git a/mingw32-libxml2.spec b/mingw32-libxml2.spec
index da986d0..c553298 100644
--- a/mingw32-libxml2.spec
+++ b/mingw32-libxml2.spec
@@ -1,12 +1,13 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+%global __strip %{_mingw32_strip}
+%global __objdump %{_mingw32_objdump}
+%global _use_internal_dependency_generator 0
+%global __find_requires %{_mingw32_findrequires}
+%global __find_provides %{_mingw32_findprovides}
+%define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-libxml2
-Version:        2.7.3
-Release:        3%{?dist}
+Version:        2.7.4
+Release:        1%{?dist}
 Summary:        MinGW Windows libxml2 XML processing library
 
 License:        MIT
@@ -17,15 +18,14 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Not required for MinGW.
 #Patch0:         libxml2-multilib.patch
-Patch1:         libxml2-2.7.3-ficora-parse.patch
 
 # MinGW-specific patches.
 Patch1000:      mingw32-libxml2-2.7.2-with-modules.patch
-Patch1001:      mingw32-libxml2-static-build-compile-fix.patch
+Patch1001:      mingw32-libxml2-win32-pthreads-compatibility.patch
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 49
+BuildRequires:  mingw32-filesystem >= 52
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 
@@ -52,11 +52,12 @@ Group:          Development/Libraries
 Static version of the MinGW Windows XML processing library.
 
 
+%{_mingw32_debug_package}
+
+
 %prep
 %setup -q -n libxml2-%{version}
 
-%patch1 -p1
-
 %patch1000 -p1
 %patch1001 -p0
 
@@ -128,7 +129,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_mingw32_libdir}/libxml2.a
 
+
 %changelog
+* Fri Sep 11 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.7.4-1
+- Update to 2.7.4
+- Drop upstreamed libxml2-2.7.3-ficora-parse.patch patch
+- Drop upstreamed mingw32-libxml2-static-build-compile-fix.patch patch
+- Added a new patch to fix compatibility with the w32 port of pthreads
+- Use %%global instead of %%define
+- Automatically generate debuginfo subpackage
+
 * Mon Aug 10 2009 Daniel Veillard <veillard at redhat.com> - 2.7.3-3
 - two patches for parsing problems CVE-2009-2414 and CVE-2009-2416
 
diff --git a/sources b/sources
index 3f929d0..75ea044 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8f4fda3969237c2a33bdb1583b5d06b2  libxml2-2.7.3.tar.gz
+961cce07211049e3bb20c5b98a1281b4  libxml2-2.7.4.tar.gz