From 7d5369405b0a0424237e6621eddde7addbbd017e Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@fedoraproject.org>
Date: Sep 24 2009 18:02:37 +0000
Subject: Upstream release of 2.7.5, Daniel


---

diff --git a/libxml2-2.7.4-input-parser.patch b/libxml2-2.7.4-input-parser.patch
deleted file mode 100644
index e82fa0f..0000000
--- a/libxml2-2.7.4-input-parser.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit 9d3d141c412baa5c713ad3df48f1a4d179e07b05
-Author: Daniel Veillard <veillard@redhat.com>
-Date:   Tue Sep 15 18:41:30 2009 +0200
-
-    Fix a parsing problem with little data at startup
-    
-    * parser.c: inkscape extension loader (and possibly others) feed
-      data to the parser very slowly, 0 at start, 4 bytes on first GROW
-      and this broke after the fix for
-      https://bugzilla.gnome.org/show_bug.cgi?id=566012
-      http://git.gnome.org/cgit/libxml2/commit/?id=7e385bd4e28a0cc12b6b26ed178c620e3c3ab8d8
-      leading to another bug
-      https://bugzilla.redhat.com/show_bug.cgi?id=523002
-      this detects the situation and GROW when needed for proper processing.
-
-diff --git a/parser.c b/parser.c
-index e415339..b41dcc3 100644
---- a/parser.c
-+++ b/parser.c
-@@ -10130,8 +10130,12 @@ xmlParseDocument(xmlParserCtxtPtr ctxt) {
-     /*
-      * Check for the XMLDecl in the Prolog.
-      * do not GROW here to avoid the detected encoder to decode more
--     * than just the first line
-+     * than just the first line, unless the amount of data is really
-+     * too small to hold "<?xml version="1.0" encoding="foo"
-      */
-+    if ((ctxt->input->end - ctxt->input->cur) < 35) {
-+       GROW;
-+    }
-     if ((CMP5(CUR_PTR, '<', '?', 'x', 'm', 'l')) && (IS_BLANK_CH(NXT(5)))) {
- 
- 	/*
diff --git a/libxml2.spec b/libxml2.spec
index 5920013..75ec7a6 100644
--- a/libxml2.spec
+++ b/libxml2.spec
@@ -1,7 +1,7 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
-Version: 2.7.4
-Release: 2%{?dist}%{?extra_release}
+Version: 2.7.5
+Release: 1%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz
@@ -9,7 +9,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: python python-devel zlib-devel pkgconfig
 URL: http://xmlsoft.org/
 Patch0: libxml2-multilib.patch
-Patch1: libxml2-2.7.4-input-parser.patch
 
 %description
 This library allows to manipulate XML files. It includes support 
@@ -68,7 +67,6 @@ at parse time or later once the document has been modified.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -143,6 +141,11 @@ rm -fr %{buildroot}
 %doc doc/python.html
 
 %changelog
+* Thu Sep 24 2009 Daniel Veillard <veillard@redhat.com> - 2.7.5-1
+- Upstream release of 2.7.5
+- fix a couple of Relax-NG validation problems
+- couple more fixes
+
 * Tue Sep 15 2009 Daniel Veillard <veillard@redhat.com> - 2.7.4-2
 - fix a problem with little data at startup affecting inkscape #523002
 
diff --git a/sources b/sources
index 75ea044..805a982 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 961cce07211049e3bb20c5b98a1281b4  libxml2-2.7.4.tar.gz
+2e29ca610579438714ebb1e4010a0ece  libxml2-2.7.5.tar.gz