From c3e8b0607394b488a86b2afd48f47f379c0c0412c347f40a6da64563f148a2fa Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Wed, 7 Oct 2020 19:07:09 +0000 Subject: [PATCH] The location of guestfs.h has moved. 0004-python-include-dirs.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=462 --- ...troduce-a-wrapper-around-xmlParseURI.patch | 54 +++++++++++-------- 0004-python-include-dirs.patch | 11 ++++ libguestfs.changes | 1 + libguestfs.spec | 2 + 4 files changed, 45 insertions(+), 23 deletions(-) create mode 100644 0004-python-include-dirs.patch diff --git a/0001-Introduce-a-wrapper-around-xmlParseURI.patch b/0001-Introduce-a-wrapper-around-xmlParseURI.patch index 5866929..a0c676f 100644 --- a/0001-Introduce-a-wrapper-around-xmlParseURI.patch +++ b/0001-Introduce-a-wrapper-around-xmlParseURI.patch @@ -37,10 +37,10 @@ libvirt URLs. create mode 100644 common/utils/libxml2-utils.c create mode 100644 common/utils/libxml2-utils.h -Index: libguestfs-1.42.0/common/mlxml/Makefile.am +Index: libguestfs-1.43.2/common/mlxml/Makefile.am =================================================================== ---- libguestfs-1.42.0.orig/common/mlxml/Makefile.am -+++ libguestfs-1.42.0/common/mlxml/Makefile.am +--- libguestfs-1.43.2.orig/common/mlxml/Makefile.am ++++ libguestfs-1.43.2/common/mlxml/Makefile.am @@ -54,6 +54,7 @@ libmlxml_a_CPPFLAGS = \ -I. \ -I$(top_builddir) \ @@ -49,10 +49,10 @@ Index: libguestfs-1.42.0/common/mlxml/Makefile.am -I$(shell $(OCAMLC) -where) libmlxml_a_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ -Index: libguestfs-1.42.0/common/mlxml/xml-c.c +Index: libguestfs-1.43.2/common/mlxml/xml-c.c =================================================================== ---- libguestfs-1.42.0.orig/common/mlxml/xml-c.c -+++ libguestfs-1.42.0/common/mlxml/xml-c.c +--- libguestfs-1.43.2.orig/common/mlxml/xml-c.c ++++ libguestfs-1.43.2/common/mlxml/xml-c.c @@ -27,17 +27,21 @@ #include #include @@ -133,19 +133,19 @@ Index: libguestfs-1.42.0/common/mlxml/xml-c.c + xmlFreeURI (uri); CAMLreturn (rv); } -Index: libguestfs-1.42.0/common/mlxml/xml.ml +Index: libguestfs-1.43.2/common/mlxml/xml.ml =================================================================== ---- libguestfs-1.42.0.orig/common/mlxml/xml.ml -+++ libguestfs-1.42.0/common/mlxml/xml.ml +--- libguestfs-1.43.2.orig/common/mlxml/xml.ml ++++ libguestfs-1.43.2/common/mlxml/xml.ml @@ -162,3 +162,4 @@ type uri = { } external parse_uri : string -> uri = "mllib_xml_parse_uri" +external parse_nonstandard_uri : string -> uri = "mllib_xml_parse_nonstandard_uri" -Index: libguestfs-1.42.0/common/mlxml/xml.mli +Index: libguestfs-1.43.2/common/mlxml/xml.mli =================================================================== ---- libguestfs-1.42.0.orig/common/mlxml/xml.mli -+++ libguestfs-1.42.0/common/mlxml/xml.mli +--- libguestfs-1.43.2.orig/common/mlxml/xml.mli ++++ libguestfs-1.43.2/common/mlxml/xml.mli @@ -115,3 +115,7 @@ val parse_uri : string -> uri Note this is different from the {!URI} module which is specialized for parsing the [-a] parameter on the command line. This function @@ -154,10 +154,10 @@ Index: libguestfs-1.42.0/common/mlxml/xml.mli +val parse_nonstandard_uri : string -> uri +(** Similar to {!parse_uri} but only for use with our non-standard + URIs. See [guestfs_int_parse_nonstandard_uri] in [common/utils]. *) -Index: libguestfs-1.42.0/common/options/uri.c +Index: libguestfs-1.43.2/common/options/uri.c =================================================================== ---- libguestfs-1.42.0.orig/common/options/uri.c -+++ libguestfs-1.42.0/common/options/uri.c +--- libguestfs-1.43.2.orig/common/options/uri.c ++++ libguestfs-1.43.2/common/options/uri.c @@ -38,6 +38,7 @@ #include "guestfs.h" @@ -178,11 +178,11 @@ Index: libguestfs-1.42.0/common/options/uri.c getprogname (), arg); return -1; } -Index: libguestfs-1.42.0/common/utils/Makefile.am +Index: libguestfs-1.43.2/common/utils/Makefile.am =================================================================== ---- libguestfs-1.42.0.orig/common/utils/Makefile.am -+++ libguestfs-1.42.0/common/utils/Makefile.am -@@ -28,6 +28,8 @@ libutils_la_SOURCES = \ +--- libguestfs-1.43.2.orig/common/utils/Makefile.am ++++ libguestfs-1.43.2/common/utils/Makefile.am +@@ -28,12 +28,15 @@ libutils_la_SOURCES = \ libxml2-cleanups.c \ libxml2-writer-macros.h \ stringlists-utils.c \ @@ -191,10 +191,18 @@ Index: libguestfs-1.42.0/common/utils/Makefile.am utils.c libutils_la_CPPFLAGS = \ -DGUESTFS_NO_DEPRECATED=1 \ -Index: libguestfs-1.42.0/common/utils/libxml2-utils.c + -DGUESTFS_PRIVATE=1 \ + -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ +- -I$(top_srcdir)/lib -I$(top_builddir)/lib ++ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ ++ -I$(top_builddir)/include + libutils_la_CFLAGS = \ + $(WARN_CFLAGS) $(WERROR_CFLAGS) \ + $(GCC_VISIBILITY_HIDDEN) \ +Index: libguestfs-1.43.2/common/utils/libxml2-utils.c =================================================================== --- /dev/null -+++ libguestfs-1.42.0/common/utils/libxml2-utils.c ++++ libguestfs-1.43.2/common/utils/libxml2-utils.c @@ -0,0 +1,178 @@ +/* libguestfs + * Copyright (C) 2017 Red Hat Inc. @@ -374,10 +382,10 @@ Index: libguestfs-1.42.0/common/utils/libxml2-utils.c + + return out; +} -Index: libguestfs-1.42.0/common/utils/libxml2-utils.h +Index: libguestfs-1.43.2/common/utils/libxml2-utils.h =================================================================== --- /dev/null -+++ libguestfs-1.42.0/common/utils/libxml2-utils.h ++++ libguestfs-1.43.2/common/utils/libxml2-utils.h @@ -0,0 +1,27 @@ +/* libguestfs + * Copyright (C) 2017 Red Hat Inc. diff --git a/0004-python-include-dirs.patch b/0004-python-include-dirs.patch new file mode 100644 index 0000000..996f05b --- /dev/null +++ b/0004-python-include-dirs.patch @@ -0,0 +1,11 @@ +--- 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 d5f0f0a..2ed946d 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -4,6 +4,7 @@ Tue Oct 6 14:07:12 MDT 2020 - carnold@suse.com - Update to version 1.43.2 * Bug fix release * Updated language files + 0004-python-include-dirs.patch - Added upstream bug fixes dbfab7d3-build-fix-includedir-in-uninstalled-libguestfs.pc.patch bfd08867-golang-Fix-path-to-include-guestfs.h..patch diff --git a/libguestfs.spec b/libguestfs.spec index 5283804..e4292e0 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -152,6 +152,7 @@ Patch2: bfd08867-golang-Fix-path-to-include-guestfs.h..patch 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 @@ -550,6 +551,7 @@ 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