- updated to 2.10.0

- updated open.gz,libx32 patches
- removed outdated man_fixes patch, libxml.3 man page is gone
- gnome-config support (xml2Conf.sh file) is gone
- keep legacy API enabled, follow upstream with disabling ftp by default

diff --git a/libxml2-libx32.patch b/libxml2-libx32.patch
index aea25a1ac5c8d8032f1857c0bfb49f54bf62566b..70cd4bf3a5d3ca25989e2208a2642fa0b9c74331 100644 (file)
--- a/libxml2-libx32.patch
+++ b/libxml2-libx32.patch
@@ -1,11 +1,11 @@
---- libxml2-2.9.10/xml2-config.in.orig 2020-01-19 17:14:27.721696222 +0100
-+++ libxml2-2.9.10/xml2-config.in      2020-01-19 17:22:13.425839953 +0100
-@@ -87,7 +87,7 @@
-             libs="@XML_LIBS@ @XML_PRIVATE_LIBS@ @MODULE_PLATFORM_LIBS@"
+--- libxml2-2.10.0/xml2-config.in.orig 2022-08-18 16:32:47.652266712 +0200
++++ libxml2-2.10.0/xml2-config.in      2022-08-18 16:33:48.715269239 +0200
+@@ -89,7 +89,7 @@ while test $# -gt 0; do
+             libs="@XML_LIBS@ @XML_PRIVATE_LIBS@ @MODULE_PLATFORM_LIBS@ @LIBS@"
          fi
  
 -        if [ "@XML_LIBDIR@" != "-L/usr/lib" -a "@XML_LIBDIR@" != "-L/usr/lib64" ]; then
 +        if [ "@XML_LIBDIR@" != "-L/usr/lib" -a "@XML_LIBDIR@" != "-L/usr/lib64" -a "@XML_LIBDIR@" != "-L/usr/libx32" ]; then
              libs="@XML_LIBDIR@ $libs"
          fi
- 
+         ;;

diff --git a/libxml2-man_fixes.patch b/libxml2-man_fixes.patch
deleted file mode 100644 (file)
index 959505d..0000000
--- a/libxml2-man_fixes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -aurN libxml2-2.6.23.orig/libxml.3 libxml2-2.6.23/libxml.3
---- libxml2-2.6.23.orig/libxml.3       2005-10-28 18:13:58.000000000 +0200
-+++ libxml2-2.6.23/libxml.3    2006-01-06 23:00:43.000000000 +0100
-@@ -48,14 +48,14 @@
- library exports Push and Pull type parser interfaces for both XML and 
- .IR html . 
- .SH FILES
--.TP 2.2i
--.B /depot/lib/libxml_2.0.0/libxml.a
-+.TP
-+.B libxml.a
- static library
- .TP
--.B /depot/lib/libxml_2.0.0/libxml.so
-+.B libxml.so
- shared library
- .TP
--.B /depot/package/libxml_2.0.0/bin/xmllint
-+.B xmllint
- binary application for parsing XML files
- .SH AUTHORS
- Daniel Veillard (daniel@veillard.com).

diff --git a/libxml2-open.gz.patch b/libxml2-open.gz.patch
index 9d361473b5cd4bb1ed4547987bb28c10e91f3fa6..644204bde6ab19ef187d72b8664f8c04a808cb1f 100644 (file)
--- a/libxml2-open.gz.patch
+++ b/libxml2-open.gz.patch
@@ -1,41 +1,38 @@
-diff -ur libxml2-2.4.20/xmlIO.c libxml2-2.4.20-/xmlIO.c
---- libxml2-2.4.20/xmlIO.c     Wed Mar 27 04:35:12 2002
-+++ libxml2-2.4.20-/xmlIO.c    Thu May 23 20:35:12 2002
-@@ -465,8 +465,35 @@
+--- libxml2-2.10.0/xmlIO.c.orig        2022-08-18 16:29:32.843322082 +0200
++++ libxml2-2.10.0/xmlIO.c     2022-08-18 16:32:12.985787850 +0200
+@@ -1115,8 +1115,33 @@ xmlGzfileOpen_real (const char *filename
  
      if (path == NULL)
        return(NULL);
 -    if (!xmlCheckFilename(path))
 -        return(NULL);
-+      
 +    if (!xmlCheckFilename(path)) {
-+        /* If we cannot open `foo.xml', we try `foo.xml.gz'. However we i
++      /* If we cannot open `foo.xml', we try `foo.xml.gz'. However we i
 +       * append .gz only if filename doesn't alreay end with .gz. */
-+        if (strlen(path) < 3 || strcmp(path + strlen(path) - 3, ".gz") != 0) {
-+            char *gz_filename = xmlMalloc(strlen(path) + 4);
++      if (strlen(path) < 3 || strcmp(path + strlen(path) - 3, ".gz") != 0) {
++          char *gz_filename = xmlMalloc(strlen(path) + 4);
 +
 +          if (gz_filename == NULL) {
 +              xmlGenericError(xmlGenericErrorContext,
 +                              "xmlGzfileOpen:  %s\n",
 +                              "Failure allocating buffer for filename.");
 +              return NULL;
-+           }
-+      
-+             strcpy(gz_filename, path);
-+           strcat(gz_filename, ".gz");
++          }
 +
-+           fd = NULL;
-+           
-+           if (xmlCheckFilename(gz_filename))
++          strcpy(gz_filename, path);
++          strcat(gz_filename, ".gz");
++
++          fd = NULL;
++
++          if (xmlCheckFilename(gz_filename))
 +              fd = gzopen(gz_filename, "rb");
-+               
-+           xmlFree(gz_filename);
++
++          xmlFree(gz_filename);
 +           
-+             return((void *) fd);
-+      } else {
++          return((void *) fd);
++      } else
 +          return NULL;
-+      }
 +    }
  
- #if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__)
+ #if defined(_WIN32)
      fd = xmlWrapGzOpenUtf8(path, "rb");

diff --git a/libxml2.spec b/libxml2.spec
index 183e19b26bedad14fec0324400288d2617b988e0..eeecd4dfb211941f85311cce5eae824d99d78e76 100644 (file)
--- a/libxml2.spec
+++ b/libxml2.spec
@@ -2,7 +2,9 @@
 # - fix build without libxml2-devel (python library uses old headers)
 #
 # Conditional build:
-%bcond_without apidocs         # do not build and package API docs
+%bcond_without apidocs         # API documentation
+%bcond_with    ftp             # FTP support
+%bcond_without legacy          # legacy API support
 %bcond_without python2         # CPython 2.x module
 %bcond_without python3         # CPython 3.x module
 %bcond_without static_libs     # static library
@@ -15,28 +17,28 @@ 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.9.14
+Version:       2.10.0
 Release:       1
 Epoch:         1
 License:       MIT
 Group:         Libraries
 #Source0:      ftp://xmlsoft.org/libxml2/%{name}-%{version}.tar.gz
-Source0:       https://download.gnome.org/sources/libxml2/2.9/%{name}-%{version}.tar.xz
-# Source0-md5: b7b3029ac6beb32a7925225515f83ca3
-Patch0:                %{name}-man_fixes.patch
-Patch1:                %{name}-open.gz.patch
-Patch2:                %{name}-largefile.patch
-Patch3:                %{name}-libx32.patch
+Source0:       https://download.gnome.org/sources/libxml2/2.10/%{name}-%{version}.tar.xz
+# Source0-md5: 54fdcf2404eb5c1ca59ffc82b2edff78
+Patch0:                %{name}-open.gz.patch
+Patch1:                %{name}-largefile.patch
+Patch2:                %{name}-libx32.patch
 # Fedora patches
 # https://bugzilla.gnome.org/show_bug.cgi?id=789714
 Patch11:       %{name}-python3-unicode-errors.patch
 URL:           http://xmlsoft.org/
 BuildRequires: autoconf >= 2.68
-BuildRequires: automake >= 1.4
+BuildRequires: automake >= 1:1.15
 BuildRequires: libtool >= 2:2.0
+BuildRequires: pkgconfig
 %if %{with python2}
-BuildRequires: python-devel >= 2.0
-BuildRequires: python-modules >= 2.0
+BuildRequires: python-devel >= 1:2.5
+BuildRequires: python-modules >= 1:2.5
 BuildRequires: python-setuptools
 BuildRequires: rpm-pythonprov
 %endif
@@ -175,12 +177,11 @@ do biblioteki libxml2.
 
 %prep
 %setup -q
-%patch0 -p1
 %if %{with zlib}
-%patch1 -p1
+%patch0 -p1
 %endif
+%patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %patch11 -p1
 
 %build
@@ -191,12 +192,14 @@ do biblioteki libxml2.
 %{__automake}
 %configure \
        --disable-silent-rules \
-       %{!?with_static_libs:--disable-static} \
-       --without-python \
-       %{!?with_zlib:--without-zlib} \
+       %{?with_static_libs:--enable-static} \
+       %{?with_ftp:--with-ftp} \
        --with-html-dir=%{_docdir}/libxml2 \
+       %{?with_legacy:--with-legacy} \
        --with-lzma \
-       --with%{!?with_mem_debug:out}-mem-debug
+       --with-mem-debug%{!?with_mem_debug:=no} \
+       --without-python \
+       %{!?with_zlib:--without-zlib}
 
 %{__make}
 
@@ -222,7 +225,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
-       EXAMPLES_DIR=%{_examplesdir}/%{name}-%{version} \
        devhelpdir=%{_gtkdocdir}/libxml2
 
 %if %{with python2}
@@ -239,9 +241,8 @@ cd python
 cd ..
 %endif
 
-# paths n/a in our packaging scheme
-%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}/Copyright
-%{__rm} $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/README
+install -d $RPM_BUILD_ROOT%{_examplesdir}
+%{__mv} $RPM_BUILD_ROOT%{_docdir}/libxml2/examples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 # install catalog file
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/xml
@@ -259,8 +260,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc Copyright NEWS README.md TODO TODO_SCHEMAS
 %attr(755,root,root) %{_libdir}/libxml2.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libxml2.so.2
-%{_mandir}/man3/libxml.3*
-
 %dir %{_sysconfdir}/xml
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xml/catalog
 
@@ -269,7 +268,6 @@ 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
 %{_libdir}/cmake/libxml2
 %{_pkgconfigdir}/libxml-2.0.pc
 %{_aclocaldir}/libxml.m4
@@ -303,10 +301,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{py_sitedir}/libxml2mod.so
 %{py_sitedir}/drv_libxml2.py[co]
 %{py_sitedir}/libxml2.py[co]
-%if "%{py_ver}" > "2.4"
 %{py_sitedir}/libxml2_python-%{version}-py*.egg-info
 %endif
-%endif
 
 %if %{with python3}
 %files -n python3-%{name}