- 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
This commit is contained in:
Olaf Hering 2021-07-19 15:32:28 +00:00 committed by Git OBS Bridge
parent 685f47c762
commit aa0545b4ec
3 changed files with 2 additions and 26 deletions

View File

@ -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')],
)

View File

@ -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

View File

@ -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