From 39509623868c8757694094a002f0037cfd16d9a6 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Thu, 18 Aug 2022 21:53:08 +0200 Subject: [PATCH] - added python-setup patch (try to use generated libxml2 configuration instead of system one); release 2 --- libxml2-python-setup.patch | 21 +++++++++++++++++++++ libxml2.spec | 5 +++-- 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 libxml2-python-setup.patch diff --git a/libxml2-python-setup.patch b/libxml2-python-setup.patch new file mode 100644 index 0000000..c29a957 --- /dev/null +++ b/libxml2-python-setup.patch @@ -0,0 +1,21 @@ +--- libxml2-2.10.0/python/setup.py.in.orig 2022-05-02 14:10:21.000000000 +0200 ++++ libxml2-2.10.0/python/setup.py.in 2022-08-18 21:39:44.799159134 +0200 +@@ -85,7 +85,8 @@ if xml_includes == "": + + # those are added in the linker search path for libraries + libdirs = [ +-os.path.join(ROOT,'lib'), ++'@abs_top_builddir@/.libs', ++'@libdir@', + ] + + xml_files = ["libxml2-api.xml", "libxml2-python-api.xml", +@@ -194,7 +195,7 @@ modules = [ 'libxml2', 'drv_libxml2' ] + if WITHDLLS: + modules.append('libxmlmods.__init__') + c_files = ['libxml2-py.c', 'libxml.c', 'types.c' ] +-includes= [xml_includes] ++includes= ['@abs_top_builddir@/include'] + libs = [libraryPrefix + "xml2"] + platformLibs + macros = [] + if with_threads: diff --git a/libxml2.spec b/libxml2.spec index eeecd4d..d31a315 100644 --- a/libxml2.spec +++ b/libxml2.spec @@ -18,7 +18,7 @@ Summary(pl.UTF-8): Biblioteka libXML wersja 2 Summary(pt_BR.UTF-8): Biblioteca libXML versão 2 Name: libxml2 Version: 2.10.0 -Release: 1 +Release: 2 Epoch: 1 License: MIT Group: Libraries @@ -28,6 +28,7 @@ Source0: https://download.gnome.org/sources/libxml2/2.10/%{name}-%{version}.tar. Patch0: %{name}-open.gz.patch Patch1: %{name}-largefile.patch Patch2: %{name}-libx32.patch +Patch3: %{name}-python-setup.patch # Fedora patches # https://bugzilla.gnome.org/show_bug.cgi?id=789714 Patch11: %{name}-python3-unicode-errors.patch @@ -182,6 +183,7 @@ do biblioteki libxml2. %endif %patch1 -p1 %patch2 -p1 +%patch3 -p1 %patch11 -p1 %build @@ -209,7 +211,6 @@ cd python cd .. %endif - %if %{with python3} cd python %py3_build -- 2.44.0