commit 769ca46c96dcb5c53b717858cc5c009401862809
Author: Jakub Bogusz <[email protected]>
Date: Wed Jun 10 22:15:54 2015 +0200
- added xmlcatalog-regression patch (fixes xmlcatalog command on
non-default catalog file)
- release 5
libxml2-xmlcatalog-regression.patch | 26 ++++++++++++++++++++++++++
libxml2.spec | 5 +++--
2 files changed, 29 insertions(+), 2 deletions(-)
---
diff --git a/libxml2.spec b/libxml2.spec
index 1868c58..1b62942 100644
--- a/libxml2.spec
+++ b/libxml2.spec
@@ -16,7 +16,7 @@ Summary(pl.UTF-8): Biblioteka libXML wersja 2
Summary(pt_BR.UTF-8): Biblioteca libXML versão 2
Name: libxml2
Version: 2.9.2
-Release: 4
+Release: 5
Epoch: 1
License: MIT
Group: Libraries
@@ -26,6 +26,7 @@ Source0:
ftp://xmlsoft.org/libxml2/%{name}-%{version}.tar.gz
Patch0: %{name}-man_fixes.patch
Patch1: %{name}-open.gz.patch
Patch2: %{name}-largefile.patch
+Patch3: %{name}-xmlcatalog-regression.patch
URL: http://xmlsoft.org/
BuildRequires: autoconf >= 2.68
BuildRequires: automake >= 1.4
@@ -37,7 +38,6 @@ BuildRequires: rpm-pythonprov
%endif
%if %{with python3}
BuildRequires: python3-devel >= 1:3.2
-BuildRequires: python3-distribute
BuildRequires: python3-modules >= 1:3.2
BuildRequires: rpm-pythonprov
%endif
@@ -171,6 +171,7 @@ dostęp do biblioteki libxml2.
%patch1 -p1
%endif
%patch2 -p1
+%patch3 -p1
%build
%{__libtoolize}
diff --git a/libxml2-xmlcatalog-regression.patch
b/libxml2-xmlcatalog-regression.patch
new file mode 100644
index 0000000..f77068f
--- /dev/null
+++ b/libxml2-xmlcatalog-regression.patch
@@ -0,0 +1,26 @@
+From f65128f38289d77ff322d63aef2858cc0a819c34 Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <[email protected]>
+Date: Fri, 17 Oct 2014 17:13:41 +0800
+Subject: Revert "Missing initialization for the catalog module"
+
+This reverts commit 054c716ea1bf001544127a4ab4f4346d1b9947e7.
+As this break xmlcatalog command
+https://bugzilla.redhat.com/show_bug.cgi?id=1153753
+
+diff --git a/parser.c b/parser.c
+index 1d93967..67c9dfd 100644
+--- a/parser.c
++++ b/parser.c
+@@ -14830,9 +14830,6 @@ xmlInitParser(void) {
+ #ifdef LIBXML_XPATH_ENABLED
+ xmlXPathInit();
+ #endif
+-#ifdef LIBXML_CATALOG_ENABLED
+- xmlInitializeCatalog();
+-#endif
+ xmlParserInitialized = 1;
+ #ifdef LIBXML_THREAD_ENABLED
+ }
+--
+cgit v0.10.2
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libxml2.git/commitdiff/769ca46c96dcb5c53b717858cc5c009401862809
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
