From 354d96158433508e6c51d7a907c90ef55b51d293 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 19 Dec 2023 15:51:14 +0000
Subject: [PATCH] New development branch version 2.3.8

---
 0001-Update-common-submodule.patch | 29 -----------------------------
 sources                            |  4 ++--
 virt-v2v.spec                      | 10 +++++-----
 3 files changed, 7 insertions(+), 36 deletions(-)
 delete mode 100644 0001-Update-common-submodule.patch

diff --git a/0001-Update-common-submodule.patch b/0001-Update-common-submodule.patch
deleted file mode 100644
index 4915cc8..0000000
--- a/0001-Update-common-submodule.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 056401c8c6db33536c477078008649054f347a9c Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Sat, 9 Dec 2023 12:59:13 +0000
-Subject: [PATCH] Update common submodule
-
-Pick up this bug fix:
-
-    mltools/libosinfo-c.c: Fix off-by-one error
----
- common | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Submodule common cd29aee912..0dba002c20:
-diff --git a/common/mltools/libosinfo-c.c b/common/mltools/libosinfo-c.c
-index 93357fd..a48c898 100644
---- a/common/mltools/libosinfo-c.c
-+++ b/common/mltools/libosinfo-c.c
-@@ -296,7 +296,7 @@ v2v_osinfo_os_get_device_drivers (value osv)
- 
-     driver = OSINFO_DEVICE_DRIVER(osinfo_list_get_nth (OSINFO_LIST(list), i));
- 
--    vi = caml_alloc (6, 0);
-+    vi = caml_alloc (7, 0);
-     str = osinfo_device_driver_get_architecture (driver);
-     copyv = caml_copy_string (str);
-     Store_field (vi, 0, copyv);
--- 
-2.43.0
-
diff --git a/sources b/sources
index fc0a319..ced2dc0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.3.7.tar.gz) = 7b17319c2dbcb594a98d0f2b0605ea9fd6cd6c01fd9cc21f8964b438a280d2c39cb5badb7d992e65d3823a44c8d662a00bdf8b7922991c078cd34d5943db4c1f
-SHA512 (virt-v2v-2.3.7.tar.gz.sig) = 2b66218532f8e85804b4cdf059cabb9b64b4619c4c238cca41682581af073fba2389ebad6874ad756c0d382f09e1ca7bc4b89441f7c298406c44ea2a6729dc25
+SHA512 (virt-v2v-2.3.8.tar.gz) = b5ac52131f7aeee5dbe33861081100ae5de0e39bde138b57a75dd5f0351881bffbcbca86558ee0f103f9839d758908740908dcdb37831f6d39c82422b5188352
+SHA512 (virt-v2v-2.3.8.tar.gz.sig) = 6a31e54a3689d294c1de4111e4a153179255eebc7ff43769b8e38938f45311e911976e7cfdd664a1ca16a71b9788c6fd004dbe5585509948ce9dc078bd28e263
diff --git a/virt-v2v.spec b/virt-v2v.spec
index 8d4532f..a553d13 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -14,8 +14,8 @@
 
 Name:          virt-v2v
 Epoch:         1
-Version:       2.3.7
-Release:       4%{?dist}
+Version:       2.3.8
+Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
 License:       GPL-2.0-or-later AND LGPL-2.0-or-later
@@ -31,9 +31,6 @@ Source2:       libguestfs.keyring
 # Maintainer script which helps with handling patches.
 Source3:       copy-patches.sh
 
-# Fixes a crash in virt-v2v and virt-customize
-Patch:         0001-Update-common-submodule.patch
-
 %if !0%{?rhel}
 # libguestfs hasn't been built on i686 for a while since there is no
 # kernel built for this architecture any longer and libguestfs rather
@@ -312,6 +309,9 @@ done
 
 
 %changelog
+* Tue Dec 19 2023 Richard W.M. Jones <rjones@redhat.com> - 1:2.3.8-1
+- New development branch version 2.3.8
+
 * Mon Dec 18 2023 Richard W.M. Jones <rjones@redhat.com> - 1:2.3.7-4
 - OCaml 5.1.1 + s390x code gen fix for Fedora 40