- up to 2.7.7

Changed files:
    libxml2-zlib.patch -> 1.2
    libxml2.spec -> 1.177

diff --git a/libxml2-zlib.patch b/libxml2-zlib.patch
deleted file mode 100644 (file)
index 4bf486d..0000000
--- a/libxml2-zlib.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a7e79f28689c574e0bbef17f4cb3da00249181ff Mon Sep 17 00:00:00 2001
-From: Mark Adler <madler@alumni.caltech.edu>
-Date: Tue, 19 Jan 2010 15:28:48 +0000
-Subject: libxml violates the zlib interface and crashes
-
-* xmlIO.c: remove an abuse of zlib API and use a clean interface
-  available in zlib >= 1.2.3
----
-diff --git a/xmlIO.c b/xmlIO.c
-index c03ac43..8fc00e3 100644
---- a/xmlIO.c
-+++ b/xmlIO.c
-@@ -2518,6 +2518,9 @@ __xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc) {
- #ifdef HAVE_ZLIB_H
-       if ((xmlInputCallbackTable[i].opencallback == xmlGzfileOpen) &&
-               (strcmp(URI, "-") != 0)) {
-+#if defined(ZLIB_VERNUM) && ZLIB_VERNUM >= 0x1230
-+            ret->compressed = !gzdirect(context);
-+#else
-           if (((z_stream *)context)->avail_in > 4) {
-               char *cptr, buff4[4];
-               cptr = (char *) ((z_stream *)context)->next_in;
-@@ -2529,6 +2532,7 @@ __xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc) {
-                   gzrewind(context);
-               }
-           }
-+#endif
-       }
- #endif
-     }
---
-cgit v0.8.3.1

diff --git a/libxml2.spec b/libxml2.spec
index 6c936fd285a9cb41884c297c253ad9e88f46ba60..77c993a35a70d833ebc01f2e9d646fd2e7913db3 100644 (file)
--- a/libxml2.spec
+++ b/libxml2.spec
@@ -9,19 +9,18 @@ Summary(es.UTF-8):    Biblioteca libXML version 2
 Summary(pl.UTF-8):     Biblioteka libXML wersja 2
 Summary(pt_BR.UTF-8):  Biblioteca libXML versão 2
 Name:          libxml2
-Version:       2.7.6
-Release:       6
+Version:       2.7.7
+Release:       1
 Epoch:         1
 License:       MIT
 Group:         Libraries
 #Source0:      http://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/%{name}-%{version}.tar.bz2
 Source0:       ftp://xmlsoft.org/libxml2/%{name}-%{version}.tar.gz
-# Source0-md5: 7740a8ec23878a2f50120e1faa2730f2
+# Source0-md5: 9abc9959823ca9ff904f1fbcf21df066
 Patch0:                %{name}-amfix.patch
 Patch1:                %{name}-man_fixes.patch
 Patch2:                %{name}-open.gz.patch
 Patch3:                %{name}-largefile.patch
-Patch4:                %{name}-zlib.patch
 URL:           http://xmlsoft.org/
 BuildRequires: autoconf >= 2.2
 BuildRequires: automake >= 1.4
@@ -142,7 +141,6 @@ Moduły języka Python dla biblioteki libxml2.
 %patch2 -p1
 %endif
 %patch3 -p1
-%patch4 -p1
 
 %build
 %{__libtoolize}