[mingw-libxml2: 24/29] Fix DTD validation

[Kalev Lember]

commit cf8cac106392b04ea16097918bd074eaca01137b
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Fri Jan 6 20:31:30 2012 +0100

    Fix DTD validation
    
    Re-added patch which was dropped in 2.7.8-1 as it is still needed
    to get DTD validation working (GNOME BZ #561340, #663588)

 libxml2-gnome-bug-561340-fix.patch |   11 +++++++++++
 mingw32-libxml2.spec               |   10 +++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/libxml2-gnome-bug-561340-fix.patch b/libxml2-gnome-bug-561340-fix.patch
new file mode 100644
index 0000000..30aa5c4
--- /dev/null
+++ b/libxml2-gnome-bug-561340-fix.patch
@@ -0,0 +1,11 @@
+--- include/libxml/xmlexports.h.orig	2010-10-12 08:25:32.000000000 +0200
++++ include/libxml/xmlexports.h	2012-01-06 20:12:26.553304833 +0100
+@@ -115,7 +115,7 @@
+    */
+   #if defined(IN_LIBXML) && !defined(LIBXML_STATIC)
+     #define XMLPUBFUN __declspec(dllexport)
+-    #define XMLPUBVAR __declspec(dllexport)
++    #define XMLPUBVAR __declspec(dllexport) extern
+   #else
+     #define XMLPUBFUN
+     #if !defined(LIBXML_STATIC)
diff --git a/mingw32-libxml2.spec b/mingw32-libxml2.spec
index c22ca81..0941d9c 100644
--- a/mingw32-libxml2.spec
+++ b/mingw32-libxml2.spec
@@ -7,7 +7,7 @@
 
 Name:           mingw32-libxml2
 Version:        2.7.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows libxml2 XML processing library
 
 License:        MIT
@@ -23,6 +23,9 @@ Patch2:         libxml2-2.7.7-xpath-double-free.patch
 # MinGW-specific patches.
 Patch1001:      mingw32-libxml2-static-build-compile-fix.patch
 
+# Patch is needed to get DTD validation working (GNOME BZ #663588)
+Patch1002:      libxml2-gnome-bug-561340-fix.patch
+
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 52
@@ -58,6 +61,7 @@ Static version of the MinGW Windows XML processing library.
 
 %patch2 -p1 -b .CVE-2010-4494
 %patch1001 -p0
+%patch1002 -p0
 
 
 %build
@@ -125,6 +129,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jan  6 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.7.8-3
+- Re-added patch which was dropped in 2.7.8-1 as it is still needed
+  to get DTD validation working (GNOME BZ #561340, #663588)
+
 * Wed Jul 06 2011 Kalev Lember <kalevlember at gmail.com> - 2.7.8-2
 - Rebuilt against win-iconv