From 3777fa33c6449e38d33d78ca05480f5346ab8889 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 9 Dec 2023 11:51:02 +0000
Subject: [PATCH] New development branch version 2.3.7

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

diff --git a/0001-common-Update-submodule.patch b/0001-common-Update-submodule.patch
deleted file mode 100644
index 4a2c17e..0000000
--- a/0001-common-Update-submodule.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From ef769cb91b54a6d4f1309518d7048b2c46559cc8 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Mon, 27 Nov 2023 14:08:01 +0000
-Subject: [PATCH] common: Update submodule
-
-Pick up this commit required by libxml2 2.12.1:
-
-    mlxml: Include <libxml/parser.h> for xmlReadMemory
----
- common | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Submodule common e711121607..6185aa8431:
-diff --git a/common/mlxml/xml-c.c b/common/mlxml/xml-c.c
-index 715c3bb..e024bd8 100644
---- a/common/mlxml/xml-c.c
-+++ b/common/mlxml/xml-c.c
-@@ -34,6 +34,7 @@
- #include <caml/memory.h>
- #include <caml/mlvalues.h>
- 
-+#include <libxml/parser.h>
- #include <libxml/xpath.h>
- #include <libxml/xpathInternals.h>
- #include <libxml/uri.h>
--- 
-2.42.0
-
diff --git a/sources b/sources
index 3c8ab31..fc0a319 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.3.6.tar.gz) = 214839bd9667dff73eae0cf7dda2f9cb8999654df387c363595e9cbd1eddc6febe73926356dfee26d18ed0f823e1fc21433278428cd083803080635ab5a20eaa
-SHA512 (virt-v2v-2.3.6.tar.gz.sig) = b1a0dcff0633231d3edcd5ce46708a2a864e300396290f9dd015552f6a8ac9c5bef0da96d340f313c17f68b35f7f55f2d9db35cb507672b9dc10c85473811aa1
+SHA512 (virt-v2v-2.3.7.tar.gz) = 7b17319c2dbcb594a98d0f2b0605ea9fd6cd6c01fd9cc21f8964b438a280d2c39cb5badb7d992e65d3823a44c8d662a00bdf8b7922991c078cd34d5943db4c1f
+SHA512 (virt-v2v-2.3.7.tar.gz.sig) = 2b66218532f8e85804b4cdf059cabb9b64b4619c4c238cca41682581af073fba2389ebad6874ad756c0d382f09e1ca7bc4b89441f7c298406c44ea2a6729dc25
diff --git a/virt-v2v.spec b/virt-v2v.spec
index c1680c9..0971e40 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -14,8 +14,8 @@
 
 Name:          virt-v2v
 Epoch:         1
-Version:       2.3.6
-Release:       2%{?dist}
+Version:       2.3.7
+Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
 License:       GPL-2.0-or-later AND LGPL-2.0-or-later
@@ -48,8 +48,6 @@ ExcludeArch:   %{ix86}
 ExclusiveArch: x86_64
 %endif
 
-Patch:         0001-common-Update-submodule.patch
-
 %if 0%{patches_touch_autotools}
 BuildRequires: autoconf, automake, libtool
 %endif
@@ -310,6 +308,9 @@ done
 
 
 %changelog
+* Sat Dec 09 2023 Richard W.M. Jones <rjones@redhat.com> - 1:2.3.7-1
+- New development branch version 2.3.7
+
 * Mon Nov 27 2023 Richard W.M. Jones <rjones@redhat.com> - 1:2.3.6-2
 - Fix build for libxml2 2.12.1