From aa0545b4ec97fcad1df4195c4f3d238d8a92e7a673fdaf0d8f56c4c47a88eb39 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 19 Jul 2021 15:32:28 +0000 Subject: [PATCH] - Remove obsolete 0004-python-include-dirs.patch and related workaround in spec file OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=475 --- 0004-python-include-dirs.patch | 11 ----------- libguestfs.changes | 2 ++ libguestfs.spec | 15 --------------- 3 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 0004-python-include-dirs.patch diff --git a/0004-python-include-dirs.patch b/0004-python-include-dirs.patch deleted file mode 100644 index 996f05b..0000000 --- a/0004-python-include-dirs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libguestfs-1.43.2/python/setup.py.in.orig 2020-10-07 11:50:58.255281701 -0600 -+++ libguestfs-1.43.2/python/setup.py.in 2020-10-07 11:51:19.023282602 -0600 -@@ -64,7 +64,7 @@ This package contains the Python binding - 'structs.c', - 'stringlists-utils.c'], - -- include_dirs=['.', '../lib'], -+ include_dirs=['.', '../lib', '../include'], - libraries=['guestfs'], - define_macros=[('GUESTFS_PRIVATE', '1')], - ) diff --git a/libguestfs.changes b/libguestfs.changes index 9a3fc9b..eac3a1c 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -5,6 +5,8 @@ Mon Jul 19 01:01:01 UTC 2021 - ohering@suse.de - Add conditional to ocaml_preserve_bytecode - Remove traces of python2 code - Use pkgconfig(python3) to refer to variants of python3 +- Remove obsolete 0004-python-include-dirs.patch and related + workaround in spec file ------------------------------------------------------------------- Fri May 28 10:20:30 UTC 2021 - ohering@suse.de diff --git a/libguestfs.spec b/libguestfs.spec index a7d76f2..cf243ad 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -148,7 +148,6 @@ Group: System/Filesystems Patch50: 0001-Introduce-a-wrapper-around-xmlParseURI.patch Patch51: 0002-common-extract-UTF-8-conversion-function.patch Patch52: 0003-inspector-rpm-summary-and-description-may-not-be-utf.patch -Patch53: 0004-python-include-dirs.patch # Our patches Patch100: appliance.patch Patch101: netconfig.patch @@ -540,7 +539,6 @@ It can import a variety of guest operating systems from libvirt-managed hosts. %patch50 -p1 %patch51 -p1 %patch52 -p1 -%patch53 -p1 %patch100 -p1 %patch101 -p1 %patch102 -p1 @@ -642,19 +640,6 @@ grep "%perl_vendorarch/" %{name}.files | tee t mv t %{name}.files %endif -%if %{with python_bindings} -pushd python -sed -i -e "s:libraries=:library_dirs=['%{buildroot}/%{_libdir}'], libraries=:" setup.py -make stamp-extra-files - -# HACKY! Change config.h for python3 -sed 's/\(#define HAVE_PYSTRING_ASSTRING 1\)/\/* \1 *\//' -i~ config.h -diff -u "$_"~ "$_" && : equal -%python3_build -%python3_install -popd -%endif - # Don't package the test harness (yet) rm -rf %{buildroot}/%{_libdir}/ocaml/v2v_test_harness