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

- Added upstream bug fixes

Browse Source 
dbfab7d3-build-fix-includedir-in-uninstalled-libguestfs.pc.patch
  bfd08867-golang-Fix-path-to-include-guestfs.h..patch

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

24
bfd08867-golang-Fix-path-to-include-guestfs.h..patch Normal file
View File

@ -0,0 +1,24 @@
Subject: golang: Fix path to include/guestfs.h.
From: Richard W.M. Jones rjones@redhat.com Tue Oct 6 15:25:32 2020 +0100
Date: Tue Oct 6 15:26:14 2020 +0100:
Git: bfd0886765fef19a8c7313402f882b543a7dfb6d
Thanks: Martin Kletzander
Fixes: commit 75abec1f706e555cd6c9915be03c732b56a94596
diff --git a/run.in b/run.in
index 90552fb04..10844a651 100755
--- a/run.in
+++ b/run.in
@@ -181,9 +181,9 @@ export GOLANG="@GOLANG@"
prepend GOPATH "$b/golang"
export GOPATH
if [ -z "$CGO_CFLAGS" ]; then
- CGO_CFLAGS="-I$s/lib"
+ CGO_CFLAGS="-I$s/include"
else
- CGO_CFLAGS="$CGO_CFLAGS -I$s/lib"
+ CGO_CFLAGS="$CGO_CFLAGS -I$s/include"
fi
export CGO_CFLAGS
if [ -z "$CGO_CFLAGS_ALLOW" ]; then

22
dbfab7d3-build-fix-includedir-in-uninstalled-libguestfs.pc.patch Normal file
View File

@ -0,0 +1,22 @@
Subject: build: fix includedir in uninstalled libguestfs.pc
From: Pino Toscano ptoscano@redhat.com Tue Sep 22 18:12:05 2020 +0200
Date: Tue Sep 22 18:12:05 2020 +0200:
Git: dbfab7d3b283181ec6ef685fff0862cdd4da76c0
Update includedir with the new directory that contains guestfs.h.
Updates commit 75abec1f706e555cd6c9915be03c732b56a94596.
diff --git a/lib/local/libguestfs.pc.in b/lib/local/libguestfs.pc.in
index 129682be8..46cef1e16 100644
--- a/lib/local/libguestfs.pc.in
+++ b/lib/local/libguestfs.pc.in
@@ -26,7 +26,7 @@
prefix=@abs_top_builddir@
exec_prefix=@abs_top_builddir@
libdir=@abs_top_builddir@/lib/.libs
-includedir=@abs_top_srcdir@/lib
+includedir=@abs_top_srcdir@/include
Name: libguestfs
Version: @VERSION@

3
libguestfs.changes
View File

@ -4,6 +4,9 @@ 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
- Added upstream bug fixes
dbfab7d3-build-fix-includedir-in-uninstalled-libguestfs.pc.patch
bfd08867-golang-Fix-path-to-include-guestfs.h..patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 20 17:16:28 MDT 2020 - carnold@suse.com Mon Jul 20 17:16:28 MDT 2020 - carnold@suse.com

5
libguestfs.spec
View File

@ -145,6 +145,9 @@ Summary: Compatibility package for guestfs-tools
License: GPL-2.0-only License: GPL-2.0-only
Group: System/Filesystems Group: System/Filesystems
Patch1: dbfab7d3-build-fix-includedir-in-uninstalled-libguestfs.pc.patch
Patch2: bfd08867-golang-Fix-path-to-include-guestfs.h..patch
# Pending upstram review # Pending upstram review
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
@ -542,6 +545,8 @@ It can import a variety of guest operating systems from libvirt-managed hosts.
: _ignore_exclusive_arch '%{?_ignore_exclusive_arch}' : _ignore_exclusive_arch '%{?_ignore_exclusive_arch}'
%setup -q -a 789653 %setup -q -a 789653
#%setup -q -a 1 -a 2 -a 789653 #%setup -q -a 1 -a 2 -a 789653
%patch1 -p1
%patch2 -p1
%patch50 -p1 %patch50 -p1
%patch51 -p1 %patch51 -p1
%patch52 -p1 %patch52 -p1