From 5a091d98c748b86b1a7b3d571a1593690e4c25b5 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 10 Dec 2022 14:38:25 +0000
Subject: [PATCH] Add upstream patch to fix virt-inspector test

---
 ...e-coreos-test-for-new-build_id-field.patch | 37 +++++++++++++++++++
 guestfs-tools.spec                            |  7 +++-
 2 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 0001-inspector-Update-coreos-test-for-new-build_id-field.patch

diff --git a/0001-inspector-Update-coreos-test-for-new-build_id-field.patch b/0001-inspector-Update-coreos-test-for-new-build_id-field.patch
new file mode 100644
index 0000000..d7a8c33
--- /dev/null
+++ b/0001-inspector-Update-coreos-test-for-new-build_id-field.patch
@@ -0,0 +1,37 @@
+From bb9cb86106f96d11c81216d4c59efe8759eba904 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Sat, 10 Dec 2022 14:35:41 +0000
+Subject: [PATCH] inspector: Update coreos test for new <build_id> field
+
+When running against libguestfs >= 1.49.8 which provides the new
+guestfs_inspect_get_build_id API the test would fail with:
+
+       <major_version>899</major_version>
+       <minor_version>13</minor_version>
+       <hostname>coreos.invalid</hostname>
+  +    <build_id>2016-03-23-0120</build_id>
+       <osinfo>coreos899.13</osinfo>
+       <mountpoints>
+         <mountpoint dev="/dev/sda5">/</mountpoint>
+  FAIL test-virt-inspector.sh (exit status: 1)
+
+Fixes: commit 4e703943ca0ac4dc5ae5a1aec229c58c56e83158
+---
+ inspector/expected-coreos.img.xml | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/inspector/expected-coreos.img.xml b/inspector/expected-coreos.img.xml
+index 0cdfba6e65..2461bcfb45 100644
+--- a/inspector/expected-coreos.img.xml
++++ b/inspector/expected-coreos.img.xml
+@@ -8,6 +8,7 @@
+     <major_version>899</major_version>
+     <minor_version>13</minor_version>
+     <hostname>coreos.invalid</hostname>
++    <build_id>2016-03-23-0120</build_id>
+     <osinfo>coreos899.13</osinfo>
+     <mountpoints>
+       <mountpoint dev="/dev/sda5">/</mountpoint>
+-- 
+2.37.3
+
diff --git a/guestfs-tools.spec b/guestfs-tools.spec
index 465e1f2..e0a6f91 100644
--- a/guestfs-tools.spec
+++ b/guestfs-tools.spec
@@ -26,7 +26,7 @@
 Summary:       Tools to access and modify virtual machine disk images
 Name:          guestfs-tools
 Version:       1.49.7
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       GPLv2+
 
 # Build only for architectures that have a kernel
@@ -48,6 +48,9 @@ Source1:       http://download.libguestfs.org/guestfs-tools/%{source_directory}/
 Source2:       libguestfs.keyring
 %endif
 
+# Upstream patch to fix virt-inspector test.
+Patch:         0001-inspector-Update-coreos-test-for-new-build_id-field.patch
+
 %if 0%{patches_touch_autotools}
 BuildRequires: autoconf, automake, libtool, gettext-devel
 %endif
@@ -426,7 +429,7 @@ end
 
 
 %changelog
-* Sat Dec 10 2022 Richard W.M. Jones <rjones@redhat.com> - 1.49.7-1
+* Sat Dec 10 2022 Richard W.M. Jones <rjones@redhat.com> - 1.49.7-2
 - New upstream development version 1.49.7
 
 * Fri Nov 25 2022 Richard W.M. Jones <rjones@redhat.com> - 1.49.6-1