Author: epienbro
Update of /cvs/pkgs/rpms/mingw32-libxml2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8947/devel
Modified Files:
.cvsignore mingw32-libxml2.spec sources
Added Files:
mingw32-libxml2-win32-pthreads-compatibility.patch
Removed Files:
libxml2-2.7.3-ficora-parse.patch
mingw32-libxml2-static-build-compile-fix.patch
Log Message:
* Fri Sep 11 2009 Erik van Pienbroek <epienbro(a)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 (F12 only)
mingw32-libxml2-win32-pthreads-compatibility.patch:
testThreads.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE mingw32-libxml2-win32-pthreads-compatibility.patch ---
--- 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++) {
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 4 May 2009 14:52:53 -0000 1.3
+++ .cvsignore 11 Sep 2009 16:37:18 -0000 1.4
@@ -1 +1 @@
-libxml2-2.7.3.tar.gz
+libxml2-2.7.4.tar.gz
Index: mingw32-libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/devel/mingw32-libxml2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mingw32-libxml2.spec 10 Aug 2009 16:17:22 -0000 1.8
+++ mingw32-libxml2.spec 11 Sep 2009 16:37:19 -0000 1.9
@@ -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}-%{ve
# 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(a)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(a)redhat.com> - 2.7.3-3
- two patches for parsing problems CVE-2009-2414 and CVE-2009-2416
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 4 May 2009 14:52:53 -0000 1.3
+++ sources 11 Sep 2009 16:37:19 -0000 1.4
@@ -1 +1 @@
-8f4fda3969237c2a33bdb1583b5d06b2 libxml2-2.7.3.tar.gz
+961cce07211049e3bb20c5b98a1281b4 libxml2-2.7.4.tar.gz
--- libxml2-2.7.3-ficora-parse.patch DELETED ---
--- mingw32-libxml2-static-build-compile-fix.patch DELETED ---