- updated to 2.8.0

- removed obsolete amfix,version-script,XPath patches

Changed files:
    libxml2-XPath.patch -> 1.2
    libxml2-amfix.patch -> 1.18
    libxml2-version-script.patch -> 1.2
    libxml2.spec -> 1.188

diff --git a/libxml2-XPath.patch b/libxml2-XPath.patch
deleted file mode 100644 (file)
index ab39d25..0000000
--- a/libxml2-XPath.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff --git a/xpath.c b/xpath.c
-index 8b56189..608fe00 100644
---- a/xpath.c
-+++ b/xpath.c
-@@ -3522,13 +3522,13 @@ xmlXPathNodeSetAddNs(xmlNodeSetPtr cur, xmlNodePtr node, xmlNsPtr ns) {
-     } else if (cur->nodeNr == cur->nodeMax) {
-         xmlNodePtr *temp;
- 
--        cur->nodeMax *= 2;
--      temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax *
-+      temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 *
-                                     sizeof(xmlNodePtr));
-       if (temp == NULL) {
-           xmlXPathErrMemory(NULL, "growing nodeset\n");
-           return;
-       }
-+        cur->nodeMax *= 2;
-       cur->nodeTab = temp;
-     }
-     cur->nodeTab[cur->nodeNr++] = xmlXPathNodeSetDupNs(node, ns);
-@@ -3627,14 +3627,14 @@ xmlXPathNodeSetAddUnique(xmlNodeSetPtr cur, xmlNodePtr val) {
-     } else if (cur->nodeNr == cur->nodeMax) {
-         xmlNodePtr *temp;
- 
--        cur->nodeMax *= 2;
--      temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax *
-+      temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 *
-                                     sizeof(xmlNodePtr));
-       if (temp == NULL) {
-           xmlXPathErrMemory(NULL, "growing nodeset\n");
-           return;
-       }
-       cur->nodeTab = temp;
-+        cur->nodeMax *= 2;
-     }
-     if (val->type == XML_NAMESPACE_DECL) {
-       xmlNsPtr ns = (xmlNsPtr) val;
-@@ -3738,14 +3738,14 @@ xmlXPathNodeSetMerge(xmlNodeSetPtr val1, xmlNodeSetPtr val2) {
-       } else if (val1->nodeNr == val1->nodeMax) {
-           xmlNodePtr *temp;
- 
--          val1->nodeMax *= 2;
--          temp = (xmlNodePtr *) xmlRealloc(val1->nodeTab, val1->nodeMax *
-+          temp = (xmlNodePtr *) xmlRealloc(val1->nodeTab, val1->nodeMax * 2 *
-                                            sizeof(xmlNodePtr));
-           if (temp == NULL) {
-               xmlXPathErrMemory(NULL, "merging nodeset\n");
-               return(NULL);
-           }
-           val1->nodeTab = temp;
-+          val1->nodeMax *= 2;
-       }
-       if (n2->type == XML_NAMESPACE_DECL) {
-           xmlNsPtr ns = (xmlNsPtr) n2;
-@@ -3907,14 +3907,14 @@ xmlXPathNodeSetMergeAndClear(xmlNodeSetPtr set1, xmlNodeSetPtr set2,
-           } else if (set1->nodeNr >= set1->nodeMax) {
-               xmlNodePtr *temp;
- 
--              set1->nodeMax *= 2;
-               temp = (xmlNodePtr *) xmlRealloc(
--                  set1->nodeTab, set1->nodeMax * sizeof(xmlNodePtr));
-+                  set1->nodeTab, set1->nodeMax * 2 * sizeof(xmlNodePtr));
-               if (temp == NULL) {
-                   xmlXPathErrMemory(NULL, "merging nodeset\n");
-                   return(NULL);
-               }
-               set1->nodeTab = temp;
-+              set1->nodeMax *= 2;
-           }
-           if (n2->type == XML_NAMESPACE_DECL) {
-               xmlNsPtr ns = (xmlNsPtr) n2;
-@@ -3991,14 +3991,14 @@ xmlXPathNodeSetMergeAndClearNoDupls(xmlNodeSetPtr set1, xmlNodeSetPtr set2,
-           } else if (set1->nodeNr >= set1->nodeMax) {
-               xmlNodePtr *temp;
- 
--              set1->nodeMax *= 2;
-               temp = (xmlNodePtr *) xmlRealloc(
--                  set1->nodeTab, set1->nodeMax * sizeof(xmlNodePtr));
-+                  set1->nodeTab, set1->nodeMax * 2 * sizeof(xmlNodePtr));
-               if (temp == NULL) {
-                   xmlXPathErrMemory(NULL, "merging nodeset\n");
-                   return(NULL);
-               }
-               set1->nodeTab = temp;
-+              set1->nodeMax *= 2;
-           }
-           set1->nodeTab[set1->nodeNr++] = n2;
-       }

diff --git a/libxml2-amfix.patch b/libxml2-amfix.patch
deleted file mode 100644 (file)
index 3b35ec2..0000000
--- a/libxml2-amfix.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -Nur libxml2-2.6.17.orig/Makefile.am libxml2-2.6.17/Makefile.am
---- libxml2-2.6.17.orig/Makefile.am    2005-01-11 10:17:08.000000000 +0100
-+++ libxml2-2.6.17/Makefile.am 2005-01-18 12:10:48.763861240 +0100
-@@ -4,7 +4,7 @@
- 
- DIST_SUBDIRS = include . doc example python xstc
- 
--INCLUDES = -I$(top_builddir)/include -I@srcdir@/include @THREAD_CFLAGS@ @Z_CFLAGS@ 
-+INCLUDES = -I$(top_builddir)/include -I$(srcdir)/include $(THREAD_CFLAGS) $(Z_CFLAGS)
- 
- noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \
-                 testThreads testC14N testAutomata testRegexp \
-@@ -16,7 +16,7 @@
- bin_SCRIPTS=xml2-config
- 
- lib_LTLIBRARIES = libxml2.la
--libxml2_la_LIBADD = @THREAD_LIBS@ @Z_LIBS@ $(ICONV_LIBS) @M_LIBS@ @WIN32_EXTRA_LIBADD@
-+libxml2_la_LIBADD = $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD)
- 
- if USE_VERSION_SCRIPT
- LIBXML2_VERSION_SCRIPT = $(VERSION_SCRIPT_FLAGS)$(srcdir)/libxml2.syms
-@@ -24,10 +24,10 @@
- LIBXML2_VERSION_SCRIPT =
- endif
- 
--libxml2_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ \
-+libxml2_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) \
-                      $(LIBXML2_VERSION_SCRIPT) \
--                   -version-info @LIBXML_VERSION_INFO@ \
--                   @MODULE_PLATFORM_LIBS@
-+                   -version-info $(LIBXML_VERSION_INFO) \
-+                   $(MODULE_PLATFORM_LIBS)
- 
- if WITH_TRIO_SOURCES
- libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c  \
-@@ -41,7 +41,7 @@
- endif
- 
- DEPS = $(top_builddir)/libxml2.la
--LDADDS = @STATIC_BINARIES@ $(top_builddir)/libxml2.la @THREAD_LIBS@ @Z_LIBS@ $(ICONV_LIBS) @M_LIBS@ @WIN32_EXTRA_LIBADD@
-+LDADDS = $(STATIC_BINARIES) $(top_builddir)/libxml2.la $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD)
- 
- 
- man_MANS = xml2-config.1 libxml.3
-@@ -52,7 +52,7 @@
- xmllint_SOURCES=xmllint.c
- xmllint_LDFLAGS = 
- xmllint_DEPENDENCIES = $(DEPS)
--xmllint_LDADD=  @RDL_LIBS@ $(LDADDS)
-+xmllint_LDADD=  $(RDL_LIBS) libxml2.la
- 
- testSAX_SOURCES=testSAX.c
- testSAX_LDFLAGS = 
-@@ -1031,8 +1031,6 @@
- 
- CLEANFILES=xml2Conf.sh
- 
--confexecdir=$(libdir)
--confexec_DATA = xml2Conf.sh
- CVS_EXTRA_DIST=
- EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \
-              libxml.m4 Copyright check-xml-test-suite.py gentest.py \

diff --git a/libxml2-version-script.patch b/libxml2-version-script.patch
deleted file mode 100644 (file)
index bc07645..0000000
--- a/libxml2-version-script.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libxml2-2.7.8/configure.in.orig    2010-11-04 18:01:19.000000000 +0100
-+++ libxml2-2.7.8/configure.in 2010-11-13 19:34:41.607099099 +0100
-@@ -84,7 +84,7 @@
-   esac
- fi
- AC_SUBST(VERSION_SCRIPT_FLAGS)
--AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -z "$VERSION_SCRIPT_FLAGS"])
-+AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"])
- 
- dnl
- dnl We process the AC_ARG_WITH first so that later we can modify

diff --git a/libxml2.spec b/libxml2.spec
index 05ed00e0d83046495103892f38e1dd4c99ed470e..ea62ed7615083b1629837ba5892a24275631eee6 100644 (file)
--- a/libxml2.spec
+++ b/libxml2.spec
@@ -13,22 +13,19 @@ 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.8
-Release:       2
+Version:       2.8.0
+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: 8127a65e8c3b08856093099b52599c86
-Patch0:                %{name}-amfix.patch
-Patch1:                %{name}-man_fixes.patch
-Patch2:                %{name}-open.gz.patch
-Patch3:                %{name}-largefile.patch
-Patch4:                %{name}-version-script.patch
-Patch5:                %{name}-XPath.patch
+# Source0-md5: c62106f02ee00b6437f0fb9d370c1093
+Patch0:                %{name}-man_fixes.patch
+Patch1:                %{name}-open.gz.patch
+Patch2:                %{name}-largefile.patch
 URL:           http://xmlsoft.org/
-BuildRequires: autoconf >= 2.2
+BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1.4
 BuildRequires: libtool >= 1:1.4.2-9
 %{?with_python:BuildRequires:  python-devel}
@@ -141,13 +138,10 @@ Moduły języka Python dla biblioteki libxml2.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %if %{with zlib}
-%patch2 -p1
+%patch1 -p1
 %endif
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -156,9 +150,10 @@ Moduły języka Python dla biblioteki libxml2.
 %{__autoheader}
 %{__automake}
 %configure \
-       %{!?with_static_libs:--enable-static=no} \
+       --disable-silent-rules \
+       %{!?with_static_libs:--disable-static=no} \
        %{!?with_python:--without-python} \
-       %{!?with_zlib:--with-zlib=no} \
+       %{!?with_zlib:--without-zlib} \
        --with%{!?with_mem_debug:out}-mem-debug
 
 %{__make}
@@ -229,6 +224,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/xml2-config
 %attr(755,root,root) %{_libdir}/libxml2.so
 %{_libdir}/libxml2.la
+%attr(755,root,root) %{_libdir}/xml2Conf.sh
 %{_pkgconfigdir}/libxml-2.0.pc
 %{_aclocaldir}/libxml.m4
 %{_includedir}/libxml2