rpm/libguestfs
SHA256
1
0
Fork 0
forked from pool/libguestfs
Code Pull Requests Activity

The location of guestfs.h has moved.

Browse Source 
0004-python-include-dirs.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=462
This commit is contained in:
Charles Arnold 2020-10-07 19:07:09 +00:00 committed by Git OBS Bridge
parent 1f8c975e36
commit c3e8b06073
4 changed files with 45 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
0001-Introduce-a-wrapper-around-xmlParseURI.patch
View File

@ -37,10 +37,10 @@ libvirt URLs.
create mode 100644 common/utils/libxml2-utils.c create mode 100644 common/utils/libxml2-utils.c
create mode 100644 common/utils/libxml2-utils.h 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.43.2.orig/common/mlxml/Makefile.am
+++ libguestfs-1.42.0/common/mlxml/Makefile.am +++ libguestfs-1.43.2/common/mlxml/Makefile.am
@@ -54,6 +54,7 @@ libmlxml_a_CPPFLAGS = \ @@ -54,6 +54,7 @@ libmlxml_a_CPPFLAGS = \
-I. \ -I. \
-I$(top_builddir) \ -I$(top_builddir) \
@ -49,10 +49,10 @@ Index: libguestfs-1.42.0/common/mlxml/Makefile.am
-I$(shell $(OCAMLC) -where) -I$(shell $(OCAMLC) -where)
libmlxml_a_CFLAGS = \ libmlxml_a_CFLAGS = \
$(WARN_CFLAGS) $(WERROR_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.43.2.orig/common/mlxml/xml-c.c
+++ libguestfs-1.42.0/common/mlxml/xml-c.c +++ libguestfs-1.43.2/common/mlxml/xml-c.c
@@ -27,17 +27,21 @@ @@ -27,17 +27,21 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -133,19 +133,19 @@ Index: libguestfs-1.42.0/common/mlxml/xml-c.c
+ xmlFreeURI (uri); + xmlFreeURI (uri);
CAMLreturn (rv); 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.43.2.orig/common/mlxml/xml.ml
+++ libguestfs-1.42.0/common/mlxml/xml.ml +++ libguestfs-1.43.2/common/mlxml/xml.ml
@@ -162,3 +162,4 @@ type uri = { @@ -162,3 +162,4 @@ type uri = {
} }
external parse_uri : string -> uri = "mllib_xml_parse_uri" external parse_uri : string -> uri = "mllib_xml_parse_uri"
+external parse_nonstandard_uri : string -> uri = "mllib_xml_parse_nonstandard_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.43.2.orig/common/mlxml/xml.mli
+++ libguestfs-1.42.0/common/mlxml/xml.mli +++ libguestfs-1.43.2/common/mlxml/xml.mli
@@ -115,3 +115,7 @@ val parse_uri : string -> uri @@ -115,3 +115,7 @@ val parse_uri : string -> uri
Note this is different from the {!URI} module which is specialized Note this is different from the {!URI} module which is specialized
for parsing the [-a] parameter on the command line. This function 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 +val parse_nonstandard_uri : string -> uri
+(** Similar to {!parse_uri} but only for use with our non-standard +(** Similar to {!parse_uri} but only for use with our non-standard
+ URIs. See [guestfs_int_parse_nonstandard_uri] in [common/utils]. *) + 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.43.2.orig/common/options/uri.c
+++ libguestfs-1.42.0/common/options/uri.c +++ libguestfs-1.43.2/common/options/uri.c
@@ -38,6 +38,7 @@ @@ -38,6 +38,7 @@
#include "guestfs.h" #include "guestfs.h"
@ -178,11 +178,11 @@ Index: libguestfs-1.42.0/common/options/uri.c
getprogname (), arg); getprogname (), arg);
return -1; 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.43.2.orig/common/utils/Makefile.am
+++ libguestfs-1.42.0/common/utils/Makefile.am +++ libguestfs-1.43.2/common/utils/Makefile.am
@@ -28,6 +28,8 @@ libutils_la_SOURCES = \ @@ -28,12 +28,15 @@ libutils_la_SOURCES = \
libxml2-cleanups.c \ libxml2-cleanups.c \
libxml2-writer-macros.h \ libxml2-writer-macros.h \
stringlists-utils.c \ stringlists-utils.c \
@ -191,10 +191,18 @@ Index: libguestfs-1.42.0/common/utils/Makefile.am
utils.c utils.c
libutils_la_CPPFLAGS = \ libutils_la_CPPFLAGS = \
-DGUESTFS_NO_DEPRECATED=1 \ -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 --- /dev/null
+++ libguestfs-1.42.0/common/utils/libxml2-utils.c +++ libguestfs-1.43.2/common/utils/libxml2-utils.c
@@ -0,0 +1,178 @@ @@ -0,0 +1,178 @@
+/* libguestfs +/* libguestfs
+ * Copyright (C) 2017 Red Hat Inc. + * Copyright (C) 2017 Red Hat Inc.
@ -374,10 +382,10 @@ Index: libguestfs-1.42.0/common/utils/libxml2-utils.c
+ +
+ return out; + return out;
+} +}
Index: libguestfs-1.42.0/common/utils/libxml2-utils.h Index: libguestfs-1.43.2/common/utils/libxml2-utils.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libguestfs-1.42.0/common/utils/libxml2-utils.h +++ libguestfs-1.43.2/common/utils/libxml2-utils.h
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
+/* libguestfs +/* libguestfs
+ * Copyright (C) 2017 Red Hat Inc. + * Copyright (C) 2017 Red Hat Inc.

11
0004-python-include-dirs.patch Normal file
View File

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

1
libguestfs.changes
View File

@ -4,6 +4,7 @@ Tue Oct 6 14:07:12 MDT 2020 - carnold@suse.com
- Update to version 1.43.2 - Update to version 1.43.2
* Bug fix release * Bug fix release
* Updated language files * Updated language files
0004-python-include-dirs.patch
- Added upstream bug fixes - Added upstream bug fixes
dbfab7d3-build-fix-includedir-in-uninstalled-libguestfs.pc.patch dbfab7d3-build-fix-includedir-in-uninstalled-libguestfs.pc.patch
bfd08867-golang-Fix-path-to-include-guestfs.h..patch bfd08867-golang-Fix-path-to-include-guestfs.h..patch

2
libguestfs.spec
View File

@ -152,6 +152,7 @@ Patch2: bfd08867-golang-Fix-path-to-include-guestfs.h..patch
Patch50: 0001-Introduce-a-wrapper-around-xmlParseURI.patch Patch50: 0001-Introduce-a-wrapper-around-xmlParseURI.patch
Patch51: 0002-common-extract-UTF-8-conversion-function.patch Patch51: 0002-common-extract-UTF-8-conversion-function.patch
Patch52: 0003-inspector-rpm-summary-and-description-may-not-be-utf.patch Patch52: 0003-inspector-rpm-summary-and-description-may-not-be-utf.patch
Patch53: 0004-python-include-dirs.patch
# Our patches # Our patches
Patch100: appliance.patch Patch100: appliance.patch
Patch101: netconfig.patch Patch101: netconfig.patch
@ -550,6 +551,7 @@ It can import a variety of guest operating systems from libvirt-managed hosts.
%patch50 -p1 %patch50 -p1
%patch51 -p1 %patch51 -p1
%patch52 -p1 %patch52 -p1
%patch53 -p1
%patch100 -p1 %patch100 -p1
%patch101 -p1 %patch101 -p1