From 1f8c975e36dd41ff5f1ff0b7931df54688e28ab498fe060dcacca386a248bc86 Mon Sep 17 00:00:00 2001
From: Charles Arnold <carnold@suse.com>
Date: Tue, 6 Oct 2020 22:07:16 +0000
Subject: [PATCH] - Added upstream bug fixes  
 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
---
 ...olang-Fix-path-to-include-guestfs.h..patch | 24 +++++++++++++++++++
 ...ludedir-in-uninstalled-libguestfs.pc.patch | 22 +++++++++++++++++
 libguestfs.changes                            |  3 +++
 libguestfs.spec                               |  5 ++++
 4 files changed, 54 insertions(+)
 create mode 100644 bfd08867-golang-Fix-path-to-include-guestfs.h..patch
 create mode 100644 dbfab7d3-build-fix-includedir-in-uninstalled-libguestfs.pc.patch

diff --git a/bfd08867-golang-Fix-path-to-include-guestfs.h..patch b/bfd08867-golang-Fix-path-to-include-guestfs.h..patch
new file mode 100644
index 0000000..1187c23
--- /dev/null
+++ b/bfd08867-golang-Fix-path-to-include-guestfs.h..patch
@@ -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
diff --git a/dbfab7d3-build-fix-includedir-in-uninstalled-libguestfs.pc.patch b/dbfab7d3-build-fix-includedir-in-uninstalled-libguestfs.pc.patch
new file mode 100644
index 0000000..7c1cc47
--- /dev/null
+++ b/dbfab7d3-build-fix-includedir-in-uninstalled-libguestfs.pc.patch
@@ -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@
diff --git a/libguestfs.changes b/libguestfs.changes
index 3e08c6e..d5f0f0a 100644
--- a/libguestfs.changes
+++ b/libguestfs.changes
@@ -4,6 +4,9 @@ Tue Oct  6 14:07:12 MDT 2020 - carnold@suse.com
 - Update to version 1.43.2
   * Bug fix release
   * 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
diff --git a/libguestfs.spec b/libguestfs.spec
index 5a36f98..5283804 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -145,6 +145,9 @@ Summary:        Compatibility package for guestfs-tools
 License:        GPL-2.0-only
 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
 Patch50:        0001-Introduce-a-wrapper-around-xmlParseURI.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}'
 %setup -q -a 789653
 #%setup -q -a 1 -a 2 -a 789653
+%patch1 -p1
+%patch2 -p1
 %patch50 -p1
 %patch51 -p1
 %patch52 -p1