From 26755e239bdeac90724486263b38303d6d6645b0 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Wed, 29 Jan 2025 15:00:48 -0700
Subject: [PATCH 01/22] OCaml 5.2.1 rebuild for Fedora 41

---
 virt-v2v.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/virt-v2v.spec b/virt-v2v.spec
index c217851..a98358f 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -7,7 +7,7 @@
 Name:          virt-v2v
 Epoch:         1
 Version:       2.7.4
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
 License:       GPL-2.0-or-later AND LGPL-2.0-or-later
@@ -310,6 +310,9 @@ done
 
 
 %changelog
+* Wed Jan 29 2025 Jerry James <loganjerry@gmail.com> - 1:2.7.4-2
+- OCaml 5.2.1 rebuild for Fedora 41
+
 * Mon Dec 09 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.4-1
 - New upstream development version 2.7.4
 

From ac5bcdcc6bdbe5f74fbc65fec029ca843d513a56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Sat, 1 Feb 2025 19:58:09 +0100
Subject: [PATCH 02/22] Add explicit BR: libxcrypt-devel
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Björn Esser <besser82@fedoraproject.org>
(cherry picked from commit ec7068338036acf2760cda65ac5dc285d5c42d02)
---
 virt-v2v.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/virt-v2v.spec b/virt-v2v.spec
index a98358f..fbb192a 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -7,7 +7,7 @@
 Name:          virt-v2v
 Epoch:         1
 Version:       2.7.4
-Release:       2%{?dist}
+Release:       4%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
 License:       GPL-2.0-or-later AND LGPL-2.0-or-later
@@ -56,6 +56,7 @@ BuildRequires: libnbd-devel
 BuildRequires: libosinfo-devel
 BuildRequires: libvirt-daemon-kvm
 BuildRequires: libvirt-devel
+BuildRequires: libxcrypt-devel
 BuildRequires: libxml2-devel
 BuildRequires: pcre2-devel
 BuildRequires: perl(Sys::Guestfs)
@@ -310,6 +311,9 @@ done
 
 
 %changelog
+* Sat Feb 01 2025 Björn Esser <besser82@fedoraproject.org> - 1:2.7.4-4
+- Add explicit BR: libxcrypt-devel
+
 * Wed Jan 29 2025 Jerry James <loganjerry@gmail.com> - 1:2.7.4-2
 - OCaml 5.2.1 rebuild for Fedora 41
 

From 4b5fb5571fbc79f71c9525f1e1d552da6c289fcd Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 4 Feb 2025 15:12:04 +0000
Subject: [PATCH 03/22] Bump and rebuild (RHBZ#2341511)

Move to OCaml 4.08, new baseline version upstream.

(cherry picked from commit ea0459111dcd66abd1b10153ddb67d3f0ba57cfb)
---
 virt-v2v.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/virt-v2v.spec b/virt-v2v.spec
index fbb192a..ea5bbab 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -7,7 +7,7 @@
 Name:          virt-v2v
 Epoch:         1
 Version:       2.7.4
-Release:       4%{?dist}
+Release:       5%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
 License:       GPL-2.0-or-later AND LGPL-2.0-or-later
@@ -44,7 +44,7 @@ BuildRequires: autoconf, automake, libtool
 BuildRequires: make
 BuildRequires: /usr/bin/pod2man
 BuildRequires: gcc
-BuildRequires: ocaml >= 4.04
+BuildRequires: ocaml >= 4.08
 
 BuildRequires: libguestfs-devel >= 1:1.49.8-1
 BuildRequires: augeas-devel
@@ -311,6 +311,9 @@ done
 
 
 %changelog
+* Tue Feb 04 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.4-5
+- Bump and rebuild (RHBZ#2341511)
+
 * Sat Feb 01 2025 Björn Esser <besser82@fedoraproject.org> - 1:2.7.4-4
 - Add explicit BR: libxcrypt-devel
 

From a9722b92fcb60f6e6c749d345ba9dc248645103e Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 5 Feb 2025 15:26:39 +0000
Subject: [PATCH 04/22] New upstream development version 2.7.5

(cherry picked from commit 938ffd31a882d343e64f13864659513b5baefa23)
---
 sources       | 4 ++--
 virt-v2v.spec | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sources b/sources
index c15d1c4..b1d2f7f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.7.4.tar.gz) = b59df1d26929ef6ed1e2599e044d3fd6e05df4c37f2854f2c567554918e0b106ffbd535be50b9bc32dbfc9d3fc5feadf157e51d394f5989449f6eb18b0a3d8dc
-SHA512 (virt-v2v-2.7.4.tar.gz.sig) = a28b5c6c6ff7599bfb771ee649101745dcfff9b9e51846b7c057764565dbb5c0c80ac22e2167f875df88e466a251f760e951ee7b92672fca6b49c4d3bd8db143
+SHA512 (virt-v2v-2.7.5.tar.gz) = e852fcfd1229023f3f5ae3cbfe6a76f8c13400fe2fb70609ebeaa5edb6d87acd0ab4bcc614a24940de18545972a038045cfa03262fca1b85b163d56924d52cac
+SHA512 (virt-v2v-2.7.5.tar.gz.sig) = 45cd3c8be8f6bb0e2c7aea42b0d9694d3e2820bdc346faebf368c07e1de8f872c45e5a2fcd852c15e759942d80772fd40bcdf7dd52d3a771d06d62d2ada30a42
diff --git a/virt-v2v.spec b/virt-v2v.spec
index ea5bbab..3938dbd 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -6,8 +6,8 @@
 
 Name:          virt-v2v
 Epoch:         1
-Version:       2.7.4
-Release:       5%{?dist}
+Version:       2.7.5
+Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
 License:       GPL-2.0-or-later AND LGPL-2.0-or-later
@@ -311,6 +311,9 @@ done
 
 
 %changelog
+* Wed Feb 05 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.5-1
+- New upstream development version 2.7.5
+
 * Tue Feb 04 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.4-5
 - Bump and rebuild (RHBZ#2341511)
 

From 87e7e2a1f55f922345bf143dc26f70127c5263b5 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 13 Feb 2025 09:54:55 +0000
Subject: [PATCH 05/22] New upstream development version 2.7.6

(cherry picked from commit 68cc862c48dce79772a43f7ade941e0e58f4e7e7)
---
 sources       | 4 ++--
 virt-v2v.spec | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sources b/sources
index b1d2f7f..bd53cbf 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.7.5.tar.gz) = e852fcfd1229023f3f5ae3cbfe6a76f8c13400fe2fb70609ebeaa5edb6d87acd0ab4bcc614a24940de18545972a038045cfa03262fca1b85b163d56924d52cac
-SHA512 (virt-v2v-2.7.5.tar.gz.sig) = 45cd3c8be8f6bb0e2c7aea42b0d9694d3e2820bdc346faebf368c07e1de8f872c45e5a2fcd852c15e759942d80772fd40bcdf7dd52d3a771d06d62d2ada30a42
+SHA512 (virt-v2v-2.7.6.tar.gz) = da70b2ceb0ddf691e2558c17d18f61814027dddaff2b7c83211139fa3690df00abf61c67a3a0e164591f400a47fd8c12f4ef8b97ee3b6b61bbefd156d9c30141
+SHA512 (virt-v2v-2.7.6.tar.gz.sig) = 2ad432847ca5653fede175911cfa873eb5a2479d6ccb317a7104650e8e5ec4a8c930588221f4aef7c4cadc0411a1220b2c51a676c0187276bf20d8e34b50a890
diff --git a/virt-v2v.spec b/virt-v2v.spec
index 3938dbd..3b89a22 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -6,7 +6,7 @@
 
 Name:          virt-v2v
 Epoch:         1
-Version:       2.7.5
+Version:       2.7.6
 Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
@@ -311,6 +311,9 @@ done
 
 
 %changelog
+* Thu Feb 13 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.6-1
+- New upstream development version 2.7.6
+
 * Wed Feb 05 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.5-1
 - New upstream development version 2.7.5
 

From 2b31dc696960219291458828ec04ed9d75cde35f Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 27 Feb 2025 09:37:21 +0000
Subject: [PATCH 06/22] New upstream development version 2.7.7

Disable gettext support in Fedora Rawhide

(cherry picked from commit 1765b12755ea534df67cd326766a1af00a7c4163)
(cherry picked from commit 27be67588bde942689b5ae0fa70235c5e6ef010f)
---
 sources       |  4 ++--
 virt-v2v.spec | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/sources b/sources
index bd53cbf..dcc29aa 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.7.6.tar.gz) = da70b2ceb0ddf691e2558c17d18f61814027dddaff2b7c83211139fa3690df00abf61c67a3a0e164591f400a47fd8c12f4ef8b97ee3b6b61bbefd156d9c30141
-SHA512 (virt-v2v-2.7.6.tar.gz.sig) = 2ad432847ca5653fede175911cfa873eb5a2479d6ccb317a7104650e8e5ec4a8c930588221f4aef7c4cadc0411a1220b2c51a676c0187276bf20d8e34b50a890
+SHA512 (virt-v2v-2.7.7.tar.gz) = 05f4cedb45c6a3596b4ec4922f018497a4852a1a20b14161068e556003d19ee5cf2737ce408515a9e701df88551008b1a674ecfe37ba547a16dfe6a91b139d7e
+SHA512 (virt-v2v-2.7.7.tar.gz.sig) = b9466b9971fcd02fbece5c511a5d3264128d5293ae39607e1d7a5c38358aa84a9cfc62a5a9d60205b4c6b6a4685d887ed13163aa166380866ad478a9fd80187a
diff --git a/virt-v2v.spec b/virt-v2v.spec
index 3b89a22..7ef75f0 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -6,7 +6,7 @@
 
 Name:          virt-v2v
 Epoch:         1
-Version:       2.7.6
+Version:       2.7.7
 Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
@@ -69,7 +69,11 @@ BuildRequires: ocaml-libguestfs-devel
 BuildRequires: ocaml-libvirt-devel
 BuildRequires: ocaml-libnbd-devel
 BuildRequires: ocaml-fileutils-devel
+%if 0%{?fedora} <= 42
+# Disable ocaml-gettext-devel in Rawhide temporarily.
+# https://src.fedoraproject.org/rpms/ocaml-gettext/pull-request/3
 BuildRequires: ocaml-gettext-devel
+%endif
 %if !0%{?rhel}
 BuildRequires: ocaml-ounit-devel
 %endif
@@ -311,6 +315,13 @@ done
 
 
 %changelog
+* Thu Feb 27 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.7-1
+- New upstream development version 2.7.7
+- Disable gettext support in Fedora Rawhide
+
+* Thu Feb 27 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.6-2
+- Bump and rebuild for ocaml-gettext 0.5.0
+
 * Thu Feb 13 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.6-1
 - New upstream development version 2.7.6
 

From 99429938803f122b4684f327d02a7ff430e635af Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 11 Mar 2025 15:39:14 +0000
Subject: [PATCH 07/22] New upstream development version 2.7.8

(cherry picked from commit dba25ec5fb8761d0825a1dd47e0da8f1b28fa4db)
---
 sources       | 4 ++--
 virt-v2v.spec | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sources b/sources
index dcc29aa..11899f8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.7.7.tar.gz) = 05f4cedb45c6a3596b4ec4922f018497a4852a1a20b14161068e556003d19ee5cf2737ce408515a9e701df88551008b1a674ecfe37ba547a16dfe6a91b139d7e
-SHA512 (virt-v2v-2.7.7.tar.gz.sig) = b9466b9971fcd02fbece5c511a5d3264128d5293ae39607e1d7a5c38358aa84a9cfc62a5a9d60205b4c6b6a4685d887ed13163aa166380866ad478a9fd80187a
+SHA512 (virt-v2v-2.7.8.tar.gz) = 0f8696f995f1c7b5816129f9b33bb7ab659eba2dd401fbd103aed253bccc0a061c3d9818bce6c143036df7f2d7b5b03957fda934bfb0d6fe6667cd040d857766
+SHA512 (virt-v2v-2.7.8.tar.gz.sig) = 56884ae3cc470b034fd1fa480a74a132e9467f33c77c15e4a902c0ce05e732f7489203a34ab0cee8079f3a679c2dfc2b2102d14eb99ee4cf5fa1bebb282e933e
diff --git a/virt-v2v.spec b/virt-v2v.spec
index 7ef75f0..3c3526a 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -6,7 +6,7 @@
 
 Name:          virt-v2v
 Epoch:         1
-Version:       2.7.7
+Version:       2.7.8
 Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
@@ -315,6 +315,9 @@ done
 
 
 %changelog
+* Tue Mar 11 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.8-1
+- New upstream development version 2.7.8
+
 * Thu Feb 27 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.7-1
 - New upstream development version 2.7.7
 - Disable gettext support in Fedora Rawhide

From 7fc01d20b9c9006649d52bdb6050d0b2d07d6bb2 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 22 Mar 2025 10:10:33 +0000
Subject: [PATCH 08/22] New upstream development version 2.7.9

(cherry picked from commit fbf3a55ceb2c859ea1609c7e463929eb7a7c3826)
---
 sources       | 4 ++--
 virt-v2v.spec | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sources b/sources
index 11899f8..dccc1d5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.7.8.tar.gz) = 0f8696f995f1c7b5816129f9b33bb7ab659eba2dd401fbd103aed253bccc0a061c3d9818bce6c143036df7f2d7b5b03957fda934bfb0d6fe6667cd040d857766
-SHA512 (virt-v2v-2.7.8.tar.gz.sig) = 56884ae3cc470b034fd1fa480a74a132e9467f33c77c15e4a902c0ce05e732f7489203a34ab0cee8079f3a679c2dfc2b2102d14eb99ee4cf5fa1bebb282e933e
+SHA512 (virt-v2v-2.7.9.tar.gz) = bf52305e06d9119dcb5ceee6d9cf8289c610e222dbd1abb89ef52e78750d5559a3b597ebccf20e9107ccde8f8fa031113c9b877b0e528302cb4f5230df0769cb
+SHA512 (virt-v2v-2.7.9.tar.gz.sig) = b26a6a6ca914dd1dc750883127dacffc7f43d46398e8867046854634ed35089e4bb0fcc68cc483d206d63817f5d15833d244f7d172f73e129ac0d5b0d034511c
diff --git a/virt-v2v.spec b/virt-v2v.spec
index 3c3526a..0ffe8cb 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -6,7 +6,7 @@
 
 Name:          virt-v2v
 Epoch:         1
-Version:       2.7.8
+Version:       2.7.9
 Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
@@ -315,6 +315,9 @@ done
 
 
 %changelog
+* Sat Mar 22 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.9-1
+- New upstream development version 2.7.9
+
 * Tue Mar 11 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.8-1
 - New upstream development version 2.7.8
 

From 873ec2c03916efc087704bcb54beadff16c7ac91 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 22 Mar 2025 11:14:34 +0000
Subject: [PATCH 09/22] New upstream version 2.7.10

The upstream 2.7.9 tarball contained a mistake that meant it required
hivexregedit to build.  2.7.10 fixes this.

(cherry picked from commit f575eed3ef0a89cd575c3c9b616bed3b8a44d297)
---
 sources       | 4 ++--
 virt-v2v.spec | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sources b/sources
index dccc1d5..05e0263 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.7.9.tar.gz) = bf52305e06d9119dcb5ceee6d9cf8289c610e222dbd1abb89ef52e78750d5559a3b597ebccf20e9107ccde8f8fa031113c9b877b0e528302cb4f5230df0769cb
-SHA512 (virt-v2v-2.7.9.tar.gz.sig) = b26a6a6ca914dd1dc750883127dacffc7f43d46398e8867046854634ed35089e4bb0fcc68cc483d206d63817f5d15833d244f7d172f73e129ac0d5b0d034511c
+SHA512 (virt-v2v-2.7.10.tar.gz) = dc45a1af2ee19f8952d84e3d4da95993c6cfe45e488df4160e87bae702ef970a0d752a85cdd90a9c6a0a350708f3f16f2658eacb9820810a14da989d4b773926
+SHA512 (virt-v2v-2.7.10.tar.gz.sig) = 4b3defa5619d8a212a5c0f62a41f2a88256acb115721b36b576ff24d9503c522a7f3bcaa34c16505bda7e1a42959cd40dcc0fb05ee43364647487f629d636e13
diff --git a/virt-v2v.spec b/virt-v2v.spec
index 0ffe8cb..6a78acf 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -6,7 +6,7 @@
 
 Name:          virt-v2v
 Epoch:         1
-Version:       2.7.9
+Version:       2.7.10
 Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
@@ -315,8 +315,8 @@ done
 
 
 %changelog
-* Sat Mar 22 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.9-1
-- New upstream development version 2.7.9
+* Sat Mar 22 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.10-1
+- New upstream development version 2.7.10
 
 * Tue Mar 11 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.8-1
 - New upstream development version 2.7.8

From 80ee42e1386f45b58091215adebab6c5e9e800c0 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 3 Apr 2025 09:47:17 +0100
Subject: [PATCH 10/22] Enable ocaml-gettext again

(cherry picked from commit 87a7e3cd66dbffc6d86f13d0313228a983375258)
---
 virt-v2v.spec | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/virt-v2v.spec b/virt-v2v.spec
index 6a78acf..36f56db 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -7,7 +7,7 @@
 Name:          virt-v2v
 Epoch:         1
 Version:       2.7.10
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
 License:       GPL-2.0-or-later AND LGPL-2.0-or-later
@@ -69,11 +69,7 @@ BuildRequires: ocaml-libguestfs-devel
 BuildRequires: ocaml-libvirt-devel
 BuildRequires: ocaml-libnbd-devel
 BuildRequires: ocaml-fileutils-devel
-%if 0%{?fedora} <= 42
-# Disable ocaml-gettext-devel in Rawhide temporarily.
-# https://src.fedoraproject.org/rpms/ocaml-gettext/pull-request/3
 BuildRequires: ocaml-gettext-devel
-%endif
 %if !0%{?rhel}
 BuildRequires: ocaml-ounit-devel
 %endif
@@ -315,6 +311,9 @@ done
 
 
 %changelog
+* Thu Apr 03 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.10-2
+- Enable ocaml-gettext again
+
 * Sat Mar 22 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.10-1
 - New upstream development version 2.7.10
 

From 104fbf36bdcf5c5c058ad63afd86b37839848c87 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 3 Apr 2025 10:06:44 +0100
Subject: [PATCH 11/22] Remove oUnit

(cherry picked from commit e94005d4aef6d2446f2a85c1abbced066ee98e65)
---
 virt-v2v.spec | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/virt-v2v.spec b/virt-v2v.spec
index 36f56db..17a7f0b 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -70,9 +70,6 @@ BuildRequires: ocaml-libvirt-devel
 BuildRequires: ocaml-libnbd-devel
 BuildRequires: ocaml-fileutils-devel
 BuildRequires: ocaml-gettext-devel
-%if !0%{?rhel}
-BuildRequires: ocaml-ounit-devel
-%endif
 
 # These are for running our limited test.
 BuildRequires: glibc-utils

From e87e18f40e1fb824a13ff6d2d9ef92a3e55a2c02 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 3 Apr 2025 12:53:44 +0100
Subject: [PATCH 12/22] New upstream development version 2.7.11

(cherry picked from commit eef1115428363cf4d2ab5129bec30c2c8989adce)
---
 sources       | 4 ++--
 virt-v2v.spec | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/sources b/sources
index 05e0263..7d00cdb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.7.10.tar.gz) = dc45a1af2ee19f8952d84e3d4da95993c6cfe45e488df4160e87bae702ef970a0d752a85cdd90a9c6a0a350708f3f16f2658eacb9820810a14da989d4b773926
-SHA512 (virt-v2v-2.7.10.tar.gz.sig) = 4b3defa5619d8a212a5c0f62a41f2a88256acb115721b36b576ff24d9503c522a7f3bcaa34c16505bda7e1a42959cd40dcc0fb05ee43364647487f629d636e13
+SHA512 (virt-v2v-2.7.11.tar.gz) = eb26d09dcd5a47969f1e94ebf26d0f71a3e618ca35c21d093c42b195c30cf6c548001bb04c9d395469bda7bfb7cef396c84e09920dde768fc4b8fcda127abd84
+SHA512 (virt-v2v-2.7.11.tar.gz.sig) = e2d9337e5d487b8542af25b67242e8b2155fede46339c7e8861ed0171bf9e97e93d0eea439acf0132c731d67412ae7237ce3341ae68e8a4f639471b5c8fd665b
diff --git a/virt-v2v.spec b/virt-v2v.spec
index 17a7f0b..04c00e7 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -6,8 +6,8 @@
 
 Name:          virt-v2v
 Epoch:         1
-Version:       2.7.10
-Release:       2%{?dist}
+Version:       2.7.11
+Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
 License:       GPL-2.0-or-later AND LGPL-2.0-or-later
@@ -308,8 +308,10 @@ done
 
 
 %changelog
-* Thu Apr 03 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.10-2
+* Thu Apr 03 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.11-1
+- New upstream development version 2.7.11
 - Enable ocaml-gettext again
+- Remove oUnit
 
 * Sat Mar 22 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.10-1
 - New upstream development version 2.7.10

From 375b4325680d95847184e61aeb4ab7f8303855d1 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 15 Apr 2025 17:02:45 +0100
Subject: [PATCH 13/22] New upstream development version 2.7.12

(cherry picked from commit b9cfcbc1bd184d4622b45823bfb8346a4e0754c0)
---
 sources       | 4 ++--
 virt-v2v.spec | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sources b/sources
index 7d00cdb..7ea33b9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.7.11.tar.gz) = eb26d09dcd5a47969f1e94ebf26d0f71a3e618ca35c21d093c42b195c30cf6c548001bb04c9d395469bda7bfb7cef396c84e09920dde768fc4b8fcda127abd84
-SHA512 (virt-v2v-2.7.11.tar.gz.sig) = e2d9337e5d487b8542af25b67242e8b2155fede46339c7e8861ed0171bf9e97e93d0eea439acf0132c731d67412ae7237ce3341ae68e8a4f639471b5c8fd665b
+SHA512 (virt-v2v-2.7.12.tar.gz) = 0de36782f19570ca48610e6d8a277ec6d3ed77f1dbe084bbc485fa21b380282c71311de650eaa2c1bff8f17e2073a9b5fd97bca67d576ba7c83a4b0c0a6d2d91
+SHA512 (virt-v2v-2.7.12.tar.gz.sig) = ec991f3e6444b9fa58a6b645649458c13b3ba76833d75087a0cdb733d628ef5f82ac6ed8ab35a7ec8b0bd4cd086faa62db1877a769c9832a71038c3161ac5531
diff --git a/virt-v2v.spec b/virt-v2v.spec
index 04c00e7..d545f3f 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -6,7 +6,7 @@
 
 Name:          virt-v2v
 Epoch:         1
-Version:       2.7.11
+Version:       2.7.12
 Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
@@ -308,6 +308,9 @@ done
 
 
 %changelog
+* Tue Apr 15 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.12-1
+- New upstream development version 2.7.12
+
 * Thu Apr 03 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.11-1
 - New upstream development version 2.7.11
 - Enable ocaml-gettext again

From 97cf14c6fc6fac0c7d3d51557536734deb825de0 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 29 Apr 2025 16:40:22 +0100
Subject: [PATCH 14/22] New upstream development version 2.7.13

(cherry picked from commit d82a76fce56b7cea77fa05e88f189a29a6daef11)
---
 sources       | 4 ++--
 virt-v2v.spec | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sources b/sources
index 7ea33b9..28cdd76 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.7.12.tar.gz) = 0de36782f19570ca48610e6d8a277ec6d3ed77f1dbe084bbc485fa21b380282c71311de650eaa2c1bff8f17e2073a9b5fd97bca67d576ba7c83a4b0c0a6d2d91
-SHA512 (virt-v2v-2.7.12.tar.gz.sig) = ec991f3e6444b9fa58a6b645649458c13b3ba76833d75087a0cdb733d628ef5f82ac6ed8ab35a7ec8b0bd4cd086faa62db1877a769c9832a71038c3161ac5531
+SHA512 (virt-v2v-2.7.13.tar.gz) = c7dc3cbafcdefa15cf0abd9b13aa2e99705f316725daca93213b7bd913905358106de3a965fbf79edd3248054c85898ee4867abad1e7de062c1e24c54e14823d
+SHA512 (virt-v2v-2.7.13.tar.gz.sig) = ac1e107f2c4364791d1bcd0a96c352351178ed0cc80ffd0167f894248607fff3110b6073c4949168df42e32c01a8f1062200d729cc54c2dc2fe40603af0ab0e6
diff --git a/virt-v2v.spec b/virt-v2v.spec
index d545f3f..44f39b3 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -6,7 +6,7 @@
 
 Name:          virt-v2v
 Epoch:         1
-Version:       2.7.12
+Version:       2.7.13
 Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
@@ -141,9 +141,9 @@ Requires:      nbdkit-ssh-plugin
 Requires:      nbdkit-vddk-plugin
 %endif
 Requires:      nbdkit-blocksize-filter
-Requires:      nbdkit-cacheextents-filter
 Requires:      nbdkit-cow-filter >= 1.28.3-1.el9
 Requires:      nbdkit-multi-conn-filter
+Requires:      nbdkit-noextents-filter
 Requires:      nbdkit-rate-filter
 Requires:      nbdkit-retry-filter
 
@@ -308,6 +308,9 @@ done
 
 
 %changelog
+* Tue Apr 29 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.13-1
+- New upstream development version 2.7.13
+
 * Tue Apr 15 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.12-1
 - New upstream development version 2.7.12
 

From e3465564c8b7868857fbfedbc286bc2447ffd6a9 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 7 May 2025 12:32:57 +0100
Subject: [PATCH 15/22] New upstream development version 2.7.14

New tool: virt-v2v-open

(cherry picked from commit a9f381c640f661ae0426ea88df5d473897372fda)
---
 sources       | 4 ++--
 virt-v2v.spec | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/sources b/sources
index 28cdd76..b333fe4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.7.13.tar.gz) = c7dc3cbafcdefa15cf0abd9b13aa2e99705f316725daca93213b7bd913905358106de3a965fbf79edd3248054c85898ee4867abad1e7de062c1e24c54e14823d
-SHA512 (virt-v2v-2.7.13.tar.gz.sig) = ac1e107f2c4364791d1bcd0a96c352351178ed0cc80ffd0167f894248607fff3110b6073c4949168df42e32c01a8f1062200d729cc54c2dc2fe40603af0ab0e6
+SHA512 (virt-v2v-2.7.14.tar.gz) = 9043e55f9072a1a7bd418c9ba3fb6703db853641a8a3cfaca53973be0cd05b7db29626fdaa497019b48f63e4e164e5932ec136a19a30005179c5fb34b59d3c91
+SHA512 (virt-v2v-2.7.14.tar.gz.sig) = 492ab121a8d47cbf5187cd7b1c0e9523897397998a58072685c10944d9440a8c602f6c375c599ebabad3f50048e89957bbefff7da707305c1b4a129e0e7efcdc
diff --git a/virt-v2v.spec b/virt-v2v.spec
index 44f39b3..53828fe 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -6,7 +6,7 @@
 
 Name:          virt-v2v
 Epoch:         1
-Version:       2.7.13
+Version:       2.7.14
 Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
@@ -274,6 +274,7 @@ done
 %{_libexecdir}/virt-v2v-in-place
 %endif
 %{_bindir}/virt-v2v-inspector
+%{_bindir}/virt-v2v-open
 %{_mandir}/man1/virt-v2v.1*
 %{_mandir}/man1/virt-v2v-hacking.1*
 %{_mandir}/man1/virt-v2v-input-vmware.1*
@@ -282,6 +283,7 @@ done
 %{_mandir}/man1/virt-v2v-in-place.1*
 %endif
 %{_mandir}/man1/virt-v2v-inspector.1*
+%{_mandir}/man1/virt-v2v-open.1*
 %{_mandir}/man1/virt-v2v-output-local.1*
 %{_mandir}/man1/virt-v2v-output-openstack.1*
 %if !0%{?rhel}
@@ -308,6 +310,10 @@ done
 
 
 %changelog
+* Wed May 07 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.14-1
+- New upstream development version 2.7.14
+- New tool: virt-v2v-open
+
 * Tue Apr 29 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.13-1
 - New upstream development version 2.7.13
 

From 4b495bbc59023a6cfac12b119f52b291a8b591a4 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 12 May 2025 17:13:28 +0100
Subject: [PATCH 16/22] New upstream development version 2.7.15

(cherry picked from commit 959a529547ea36b42c5415e4314c2d370886b581)
---
 sources       | 4 ++--
 virt-v2v.spec | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sources b/sources
index b333fe4..f30eb94 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.7.14.tar.gz) = 9043e55f9072a1a7bd418c9ba3fb6703db853641a8a3cfaca53973be0cd05b7db29626fdaa497019b48f63e4e164e5932ec136a19a30005179c5fb34b59d3c91
-SHA512 (virt-v2v-2.7.14.tar.gz.sig) = 492ab121a8d47cbf5187cd7b1c0e9523897397998a58072685c10944d9440a8c602f6c375c599ebabad3f50048e89957bbefff7da707305c1b4a129e0e7efcdc
+SHA512 (virt-v2v-2.7.15.tar.gz) = 3762a48dbb8ebb04e39496a816b6a367b78fb6a1137f5bc7b11c369692f80790afea8a0314a0f2e5dfbd9891f055f3f163e77fb6203029f1b2c17c444e3b7343
+SHA512 (virt-v2v-2.7.15.tar.gz.sig) = 1e9d2bab8a1cb757cd3222c2f77f4ff887fffd3b82ce380ce9b9850f183a31c1686f054b5b48cf0dad286d0fc5c5a12a7fe5a8b708b9f3b1b1ab0227ff35bac3
diff --git a/virt-v2v.spec b/virt-v2v.spec
index 53828fe..62ab93f 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -6,7 +6,7 @@
 
 Name:          virt-v2v
 Epoch:         1
-Version:       2.7.14
+Version:       2.7.15
 Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
@@ -310,6 +310,9 @@ done
 
 
 %changelog
+* Mon May 12 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.15-1
+- New upstream development version 2.7.15
+
 * Wed May 07 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.14-1
 - New upstream development version 2.7.14
 - New tool: virt-v2v-open

From 76578de53aaf01bc56faeca6aa0d533050de610f Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 12 May 2025 18:58:41 +0100
Subject: [PATCH 17/22] Rename virt-v2v-output-rhv(1) ->
 virt-v2v-output-ovirt(1)

(cherry picked from commit 670ec36027beb4579ccf9426315dddd1609b59b6)
---
 virt-v2v.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/virt-v2v.spec b/virt-v2v.spec
index 62ab93f..8971592 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -232,7 +232,7 @@ mv $RPM_BUILD_ROOT%{_bindir}/virt-v2v-in-place $RPM_BUILD_ROOT%{_libexecdir}/
 rm $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v-in-place.1*
 # these are also not supported on RHEL
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v-input-xen.1*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v-output-rhv.1*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v-output-ovirt.1*
 %endif
 
 # Find locale files.
@@ -287,7 +287,7 @@ done
 %{_mandir}/man1/virt-v2v-output-local.1*
 %{_mandir}/man1/virt-v2v-output-openstack.1*
 %if !0%{?rhel}
-%{_mandir}/man1/virt-v2v-output-rhv.1*
+%{_mandir}/man1/virt-v2v-output-ovirt.1*
 %endif
 %{_mandir}/man1/virt-v2v-release-notes-1.42.1*
 %{_mandir}/man1/virt-v2v-release-notes-2.*.1*

From 77adf7438a76edb137adc2070b8f6bb968436365 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 19 May 2025 15:08:45 +0100
Subject: [PATCH 18/22] New upstream development version 2.7.16

(cherry picked from commit b04c24f962fdd2e38ab53370c43e4218190c10a4)
---
 sources       | 4 ++--
 virt-v2v.spec | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/sources b/sources
index f30eb94..ddc954d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.7.15.tar.gz) = 3762a48dbb8ebb04e39496a816b6a367b78fb6a1137f5bc7b11c369692f80790afea8a0314a0f2e5dfbd9891f055f3f163e77fb6203029f1b2c17c444e3b7343
-SHA512 (virt-v2v-2.7.15.tar.gz.sig) = 1e9d2bab8a1cb757cd3222c2f77f4ff887fffd3b82ce380ce9b9850f183a31c1686f054b5b48cf0dad286d0fc5c5a12a7fe5a8b708b9f3b1b1ab0227ff35bac3
+SHA512 (virt-v2v-2.7.16.tar.gz) = 321512ab4773616d0ff8ad21268617e20097a8f6b44850497fce2d5830727c49aca82b0142eca775447522b1d29edef82afd062cf01c2c84388b0193a73902f8
+SHA512 (virt-v2v-2.7.16.tar.gz.sig) = da589c28af55801305a9fbe2463907a91ec7cf75ba438096ab844065cb7b0ad44208541260047bcd6bdd938230689bc4c685f4ca6cb95fc095eaa660213d9687
diff --git a/virt-v2v.spec b/virt-v2v.spec
index 8971592..bc28333 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -6,7 +6,7 @@
 
 Name:          virt-v2v
 Epoch:         1
-Version:       2.7.15
+Version:       2.7.16
 Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
@@ -46,7 +46,7 @@ BuildRequires: /usr/bin/pod2man
 BuildRequires: gcc
 BuildRequires: ocaml >= 4.08
 
-BuildRequires: libguestfs-devel >= 1:1.49.8-1
+BuildRequires: libguestfs-devel >= 1:1.55.12-1
 BuildRequires: augeas-devel
 BuildRequires: bash-completion, bash-completion-devel
 BuildRequires: file-devel
@@ -91,7 +91,7 @@ BuildRequires: glibc-static
 BuildRequires: gnupg2
 %endif
 
-Requires:      libguestfs%{?_isa} >= 1:1.49.8-1
+Requires:      libguestfs%{?_isa} >= 1:1.55.12-1
 Requires:      guestfs-tools >= 1.49.7-1
 
 # XFS is the default filesystem in Fedora and RHEL.
@@ -310,6 +310,9 @@ done
 
 
 %changelog
+* Mon May 19 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.16-1
+- New upstream development version 2.7.16
+
 * Mon May 12 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.15-1
 - New upstream development version 2.7.15
 

From b374f060f920811a27f64e34b2df6700e8a854cd Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 19 May 2025 16:43:07 +0100
Subject: [PATCH 19/22] Add temporary workaround for bug in gettext

(cherry picked from commit 5d3dce2ea50b1b91064304793269d0b5e61460b2)
---
 virt-v2v.spec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/virt-v2v.spec b/virt-v2v.spec
index bc28333..0bc9bfa 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -204,6 +204,9 @@ for %{name}.
 %endif
 %autosetup -p1
 
+# ACLOCAL_PATH is temporarily required to work around
+# https://bugzilla.redhat.com/show_bug.cgi?id=2366708
+export ACLOCAL_PATH=/usr/share/gettext/m4/
 autoreconf -fiv
 
 

From 67965964a122544b6b226efa192f1891975974b4 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 3 Jun 2025 16:34:56 +0100
Subject: [PATCH 20/22] New upstream development version 2.7.17

(cherry picked from commit 0950fa2dd44fbe9bc781a310fe5f64ecf0b34d2e)
---
 sources       | 4 ++--
 virt-v2v.spec | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sources b/sources
index ddc954d..4ebab14 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.7.16.tar.gz) = 321512ab4773616d0ff8ad21268617e20097a8f6b44850497fce2d5830727c49aca82b0142eca775447522b1d29edef82afd062cf01c2c84388b0193a73902f8
-SHA512 (virt-v2v-2.7.16.tar.gz.sig) = da589c28af55801305a9fbe2463907a91ec7cf75ba438096ab844065cb7b0ad44208541260047bcd6bdd938230689bc4c685f4ca6cb95fc095eaa660213d9687
+SHA512 (virt-v2v-2.7.17.tar.gz) = 72b476ca6f0198ddd1ac9f52b834bc6720374b86d52014a3707ba42a0bfdb2098a8a8f76bae6b01c222c1d83c60909e472fc4ad000e057faad337fce49299a15
+SHA512 (virt-v2v-2.7.17.tar.gz.sig) = a196e3e2100777a714c11e9adb7f8bf49bb626b57ec5ec7db9bf459a2942d3523fd4801aacffc0354357b5054fd69e1dfc222c7a254ff6b53f55d8832dea8295
diff --git a/virt-v2v.spec b/virt-v2v.spec
index 0bc9bfa..47d9b0c 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -6,7 +6,7 @@
 
 Name:          virt-v2v
 Epoch:         1
-Version:       2.7.16
+Version:       2.7.17
 Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
@@ -313,6 +313,9 @@ done
 
 
 %changelog
+* Tue Jun 03 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.17-1
+- New upstream development version 2.7.17
+
 * Mon May 19 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.16-1
 - New upstream development version 2.7.16
 

From 270f16217694f5a4f7f1a00acdf783af5aa21ed2 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 11 Jun 2025 14:47:45 +0100
Subject: [PATCH 21/22] New upstream stable version 2.8.0

Finetune BRs to match upstream.

(cherry picked from commit 689bbb8b49fe0261c4e7bd8717f8630497b3ed55)
---
 sources       |  4 ++--
 virt-v2v.spec | 14 +++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/sources b/sources
index 4ebab14..87f7673 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.7.17.tar.gz) = 72b476ca6f0198ddd1ac9f52b834bc6720374b86d52014a3707ba42a0bfdb2098a8a8f76bae6b01c222c1d83c60909e472fc4ad000e057faad337fce49299a15
-SHA512 (virt-v2v-2.7.17.tar.gz.sig) = a196e3e2100777a714c11e9adb7f8bf49bb626b57ec5ec7db9bf459a2942d3523fd4801aacffc0354357b5054fd69e1dfc222c7a254ff6b53f55d8832dea8295
+SHA512 (virt-v2v-2.8.0.tar.gz) = b4ceb8694a418fc4c1dd0951ddabe332cbce4e9b75137ab5a186a22d1ad0d1e09476aa51b44fd6da3016d3d45b69b2c0ee40941b5f0a2cf25f3f3df514b3dd25
+SHA512 (virt-v2v-2.8.0.tar.gz.sig) = cd79caaea2edb345f641f6be7ffda3f58322d788aa716cde0654dc7f340f13303c437a7e8dd7507ed01e502257a0b808977e5b93c88b7b26669b9c0ba32753a7
diff --git a/virt-v2v.spec b/virt-v2v.spec
index 47d9b0c..6e8772c 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -2,11 +2,11 @@
 %global verify_tarball_signature 1
 
 # The source directory.
-%global source_directory 2.7-development
+%global source_directory 2.8-stable
 
 Name:          virt-v2v
 Epoch:         1
-Version:       2.7.17
+Version:       2.8.0
 Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
@@ -46,13 +46,13 @@ BuildRequires: /usr/bin/pod2man
 BuildRequires: gcc
 BuildRequires: ocaml >= 4.08
 
-BuildRequires: libguestfs-devel >= 1:1.55.12-1
+BuildRequires: libguestfs-devel >= 1:1.56.0-1
 BuildRequires: augeas-devel
 BuildRequires: bash-completion, bash-completion-devel
-BuildRequires: file-devel
+BuildRequires: file
 BuildRequires: gettext-devel
 BuildRequires: json-c-devel
-BuildRequires: libnbd-devel
+BuildRequires: libnbd-devel >= 1.14
 BuildRequires: libosinfo-devel
 BuildRequires: libvirt-daemon-kvm
 BuildRequires: libvirt-devel
@@ -313,6 +313,10 @@ done
 
 
 %changelog
+* Wed Jun 11 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.8.0-1
+- New upstream stable version 2.8.0
+- Finetune BRs to match upstream.
+
 * Tue Jun 03 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.17-1
 - New upstream development version 2.7.17
 

From 77450f3faaf9837a10d7144a258cf1d49268a9f3 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 26 Jun 2025 16:26:03 +0100
Subject: [PATCH 22/22] New upstream stable version 2.8.1

(cherry picked from commit b406c18f55bc4e608e9d0489a89ea55ca740cdd8)
---
 sources       | 4 ++--
 virt-v2v.spec | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sources b/sources
index 87f7673..55ec579 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.8.0.tar.gz) = b4ceb8694a418fc4c1dd0951ddabe332cbce4e9b75137ab5a186a22d1ad0d1e09476aa51b44fd6da3016d3d45b69b2c0ee40941b5f0a2cf25f3f3df514b3dd25
-SHA512 (virt-v2v-2.8.0.tar.gz.sig) = cd79caaea2edb345f641f6be7ffda3f58322d788aa716cde0654dc7f340f13303c437a7e8dd7507ed01e502257a0b808977e5b93c88b7b26669b9c0ba32753a7
+SHA512 (virt-v2v-2.8.1.tar.gz) = 70da68563e870955ca013e6d55be8f56ad65dde6f84909f06fae7ab928227a566e8949bb90e839fffce2ad4ebc604b2cfa1c5547394c8d1bd092bb95f9e6435c
+SHA512 (virt-v2v-2.8.1.tar.gz.sig) = 1236dd21272c53dbafb4cd0ac4177bcf73600ff52ea8949b878793eafb1829a67880043c6e03c2d82c691d986ea8a7daa60508f4ae22345c961a939b3b6a43b0
diff --git a/virt-v2v.spec b/virt-v2v.spec
index 6e8772c..99ee1a7 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -6,7 +6,7 @@
 
 Name:          virt-v2v
 Epoch:         1
-Version:       2.8.0
+Version:       2.8.1
 Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
@@ -313,6 +313,9 @@ done
 
 
 %changelog
+* Thu Jun 26 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.8.1-1
+- New upstream stable version 2.8.1
+
 * Wed Jun 11 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.8.0-1
 - New upstream stable version 2.8.0
 - Finetune BRs to match upstream.