From ef7323ad39da8e28a829582d0912d63191c95be2 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 11 Apr 2024 18:04:57 +0100
Subject: [PATCH 01/16] Revert "BR bash-completion-devel (new in Rawhide)"

Revert this commit, bash-completion-devel does not exist in F40.

This reverts commit db13600d9d85572bdea518e510348f44776d4dd5.
---
 virt-v2v.spec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/virt-v2v.spec b/virt-v2v.spec
index 97966eb..85ad948 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -48,7 +48,7 @@ BuildRequires: ocaml >= 4.04
 
 BuildRequires: libguestfs-devel >= 1:1.49.8-1
 BuildRequires: augeas-devel
-BuildRequires: bash-completion, bash-completion-devel
+BuildRequires: bash-completion
 BuildRequires: file-devel
 BuildRequires: gettext-devel
 BuildRequires: jansson-devel
@@ -306,7 +306,6 @@ done
 
 * Tue Mar 12 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.2-1
 - New development branch version 2.5.2
-- BR bash-completion-devel (new in Rawhide)
 
 * Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

From bfa658401ff451dec396756ce65e13906654a6bf Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 12 Apr 2024 22:12:58 +0100
Subject: [PATCH 02/16] Fix bytecode compilation (RHBZ#2274708)

(cherry picked from commit 5d4370f7888a20b2b953ad92db59dc4999b4df61)
---
 ...pilation-to-output-whole-exe-instead.patch | 31 +++++++++++++++++++
 virt-v2v.spec                                 |  3 ++
 2 files changed, 34 insertions(+)
 create mode 100644 0001-Fix-bytecode-compilation-to-output-whole-exe-instead.patch

diff --git a/0001-Fix-bytecode-compilation-to-output-whole-exe-instead.patch b/0001-Fix-bytecode-compilation-to-output-whole-exe-instead.patch
new file mode 100644
index 0000000..382d18f
--- /dev/null
+++ b/0001-Fix-bytecode-compilation-to-output-whole-exe-instead.patch
@@ -0,0 +1,31 @@
+From 5eeae696b2c56230d5d5fed5c86b7bf2b3942d4e Mon Sep 17 00:00:00 2001
+From: Jerry James <loganjerry@gmail.com>
+Date: Fri, 12 Apr 2024 20:11:50 +0100
+Subject: [PATCH] Fix bytecode compilation to output whole exe instead of using
+ -custom
+
+These binaries are more resistant to being stripped.
+
+Reported-by: Ilya Leoshkevich
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2274708
+(cherry picked from guestfs-tools commit c249fd5caca8f1eed439f83e2bb1af46c8a28a27)
+---
+ subdir-rules.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/subdir-rules.mk b/subdir-rules.mk
+index 78d574a813..e969f357b7 100644
+--- a/subdir-rules.mk
++++ b/subdir-rules.mk
+@@ -47,7 +47,7 @@ $(top_builddir)/generator/generator:
+ 
+ if !HAVE_OCAMLOPT
+ MLARCHIVE = cma
+-LINK_CUSTOM_OCAMLC_ONLY = -custom
++LINK_CUSTOM_OCAMLC_ONLY = -output-complete-exe
+ BEST = c
+ else
+ MLARCHIVE = cmxa
+-- 
+2.44.0
+
diff --git a/virt-v2v.spec b/virt-v2v.spec
index 85ad948..4b7b260 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -23,6 +23,9 @@ Source2:       libguestfs.keyring
 # Maintainer script which helps with handling patches.
 Source3:       copy-patches.sh
 
+# Fix bytecode compilation (RHBZ#2274708)
+Patch:         0001-Fix-bytecode-compilation-to-output-whole-exe-instead.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

From 63394d37aa856d74694db9e9f975c89003e784d8 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 12 Apr 2024 22:15:18 +0100
Subject: [PATCH 03/16] Bump release

- Fix bytecode compilation (RHBZ#2274708)

(cherry picked from commit c087ce454eb4da068dc2d6e10c19378b7862a2e9)
---
 virt-v2v.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/virt-v2v.spec b/virt-v2v.spec
index 4b7b260..2b04320 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -7,7 +7,7 @@
 Name:          virt-v2v
 Epoch:         1
 Version:       2.5.3
-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
@@ -300,6 +300,9 @@ done
 
 
 %changelog
+* Fri Apr 12 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.3-2
+- Fix bytecode compilation (RHBZ#2274708)
+
 * Thu Apr 11 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.3-1
 - New development branch version 2.5.3
 - Unconditionally run autoreconf.

From 328cb530d44fdb26e47a854c3d67dea9e5c7f904 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 16 Apr 2024 13:02:33 +0100
Subject: [PATCH 04/16] gating: Match any version of RHEL

(cherry picked from commit 6084b1f112d62ae9f28a47e877b755b84a6f2a18)
---
 gating.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gating.yaml b/gating.yaml
index 8c4c77a..336c565 100755
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,6 +1,6 @@
 --- !Policy
 product_versions:
-  - rhel-9
+  - rhel-*
 decision_context: osci_compose_gate
 rules:
   - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

From 7fb40c9e669e66bfb83103c3230a522f8d4e5f3d Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 25 Apr 2024 15:23:35 +0100
Subject: [PATCH 05/16] New upstream development version 2.5.4

(cherry picked from commit 8aab9f5c68fc11366152d0b98676d91544c997d8)
---
 ...pilation-to-output-whole-exe-instead.patch | 31 -------------------
 sources                                       |  4 +--
 virt-v2v.spec                                 | 10 +++---
 3 files changed, 7 insertions(+), 38 deletions(-)
 delete mode 100644 0001-Fix-bytecode-compilation-to-output-whole-exe-instead.patch

diff --git a/0001-Fix-bytecode-compilation-to-output-whole-exe-instead.patch b/0001-Fix-bytecode-compilation-to-output-whole-exe-instead.patch
deleted file mode 100644
index 382d18f..0000000
--- a/0001-Fix-bytecode-compilation-to-output-whole-exe-instead.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5eeae696b2c56230d5d5fed5c86b7bf2b3942d4e Mon Sep 17 00:00:00 2001
-From: Jerry James <loganjerry@gmail.com>
-Date: Fri, 12 Apr 2024 20:11:50 +0100
-Subject: [PATCH] Fix bytecode compilation to output whole exe instead of using
- -custom
-
-These binaries are more resistant to being stripped.
-
-Reported-by: Ilya Leoshkevich
-Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2274708
-(cherry picked from guestfs-tools commit c249fd5caca8f1eed439f83e2bb1af46c8a28a27)
----
- subdir-rules.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/subdir-rules.mk b/subdir-rules.mk
-index 78d574a813..e969f357b7 100644
---- a/subdir-rules.mk
-+++ b/subdir-rules.mk
-@@ -47,7 +47,7 @@ $(top_builddir)/generator/generator:
- 
- if !HAVE_OCAMLOPT
- MLARCHIVE = cma
--LINK_CUSTOM_OCAMLC_ONLY = -custom
-+LINK_CUSTOM_OCAMLC_ONLY = -output-complete-exe
- BEST = c
- else
- MLARCHIVE = cmxa
--- 
-2.44.0
-
diff --git a/sources b/sources
index bd7cbc4..9c7906f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.5.3.tar.gz) = 9f6e0618db7c6e57192ad83aeb9f4978935aa387fabe62e952c5ea473fe88973323fb02d43eac615dca33b88590f8a824a3ea761691d273e6853674974c193da
-SHA512 (virt-v2v-2.5.3.tar.gz.sig) = c4fc7f3ff201501bdeda1202268da9fa9d393131762a28f38e0addd6397ba2f92a1c4bf811672cac66b54f095293e90a757786f2aec14c2f73da8035403c6b19
+SHA512 (virt-v2v-2.5.4.tar.gz) = ea872978eefc9feacb6048bb217449804612e5cc68bfbd1f20e5aaf637ca7ca8be92798ba1cbc1d2d6ddbf6a07628e79beea7db1966150675d9fbda9d4361b7a
+SHA512 (virt-v2v-2.5.4.tar.gz.sig) = 02780e8ae0bdff8c5b22b52bdd24d5f9dfa2d808b792abf7f8bcaa8c4e2c12ea52d3f2cd2c64b8a261437db69409f9ea1d12ac182dbc96e2bb5441a434ac7f84
diff --git a/virt-v2v.spec b/virt-v2v.spec
index 2b04320..d21af15 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -6,8 +6,8 @@
 
 Name:          virt-v2v
 Epoch:         1
-Version:       2.5.3
-Release:       2%{?dist}
+Version:       2.5.4
+Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
 License:       GPL-2.0-or-later AND LGPL-2.0-or-later
@@ -23,9 +23,6 @@ Source2:       libguestfs.keyring
 # Maintainer script which helps with handling patches.
 Source3:       copy-patches.sh
 
-# Fix bytecode compilation (RHBZ#2274708)
-Patch:         0001-Fix-bytecode-compilation-to-output-whole-exe-instead.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
@@ -300,6 +297,9 @@ done
 
 
 %changelog
+* Thu Apr 25 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.4-1
+- New upstream development version 2.5.4
+
 * Fri Apr 12 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.3-2
 - Fix bytecode compilation (RHBZ#2274708)
 

From b5d900adb3cf495add4002f5be1a07d284ce6b5c Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 19 Jun 2024 17:55:42 +0100
Subject: [PATCH 06/16] BR glibc-utils

Avoids this error with latest glibc:

ERROR: ld.so: object 'libc_malloc_debug.so.0' from LD_PRELOAD cannot be preloaded (cannot open shared object file): ignored.
(cherry picked from commit f722fff7336eab416641291ba753b50a9375a836)
---
 virt-v2v.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/virt-v2v.spec b/virt-v2v.spec
index d21af15..82178e6 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -74,6 +74,7 @@ BuildRequires: ocaml-ounit-devel
 %endif
 
 # These are for running our limited test.
+BuildRequires: glibc-utils
 BuildRequires: %{_bindir}/qemu-nbd
 BuildRequires: %{_bindir}/nbdcopy
 BuildRequires: %{_bindir}/nbdinfo

From 07882983a10b463d17fd1776b6286a3714fd74d3 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 8 Jul 2024 10:38:25 +0100
Subject: [PATCH 07/16] RHEL 10: Remove virt-v2v-input-xen.1* and
 virt-v2v-output-rhv.1*

See:
https://issues.redhat.com/browse/RHEL-36712
https://issues.redhat.com/browse/RHEL-37687
(cherry picked from commit 41bc8532d0c2dd6ee325d8579db7d231afc46cfe)
---
 virt-v2v.spec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/virt-v2v.spec b/virt-v2v.spec
index 82178e6..f2ba543 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -267,14 +267,16 @@ done
 %{_mandir}/man1/virt-v2v.1*
 %{_mandir}/man1/virt-v2v-hacking.1*
 %{_mandir}/man1/virt-v2v-input-vmware.1*
-%{_mandir}/man1/virt-v2v-input-xen.1*
 %if !0%{?rhel}
+%{_mandir}/man1/virt-v2v-input-xen.1*
 %{_mandir}/man1/virt-v2v-in-place.1*
 %endif
 %{_mandir}/man1/virt-v2v-inspector.1*
 %{_mandir}/man1/virt-v2v-output-local.1*
 %{_mandir}/man1/virt-v2v-output-openstack.1*
+%if !0%{?rhel}
 %{_mandir}/man1/virt-v2v-output-rhv.1*
+%endif
 %{_mandir}/man1/virt-v2v-release-notes-1.42.1*
 %{_mandir}/man1/virt-v2v-release-notes-2.0.1*
 %{_mandir}/man1/virt-v2v-release-notes-2.2.1*

From a8c88aea0d009e54fbb89df785cc1692846800d3 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 9 Jul 2024 11:25:24 +0100
Subject: [PATCH 08/16] Install virt-v2v-in-place as unsupported tool on RHEL

On RHEL we want to ship virt-v2v-in-place, but it is not supported, so
move it to libexec and remove the documentation.

Fixes: https://issues.redhat.com/browse/RHEL-40903
(cherry picked from commit 37f4f2f35dc14de187f53abc82c0e0054c315243)
---
 virt-v2v.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/virt-v2v.spec b/virt-v2v.spec
index f2ba543..56676fc 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -222,8 +222,10 @@ make V=1 %{?_smp_mflags}
 find $RPM_BUILD_ROOT -name '*.la' -delete
 
 %if 0%{?rhel}
-# On RHEL remove virt-v2v-in-place.
-rm $RPM_BUILD_ROOT%{_bindir}/virt-v2v-in-place
+# On RHEL move virt-v2v-in-place to libexec since it is not supported,
+# and remove the documentation.
+mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
+mv $RPM_BUILD_ROOT%{_bindir}/virt-v2v-in-place $RPM_BUILD_ROOT%{_libexecdir}/
 rm $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v-in-place.1*
 %endif
 
@@ -262,6 +264,8 @@ done
 %{_bindir}/virt-v2v
 %if !0%{?rhel}
 %{_bindir}/virt-v2v-in-place
+%else
+%{_libexecdir}/virt-v2v-in-place
 %endif
 %{_bindir}/virt-v2v-inspector
 %{_mandir}/man1/virt-v2v.1*

From b213034715a8669e8d22065f6dedddf340c0323c Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 11 Jul 2024 12:28:07 +0100
Subject: [PATCH 09/16] New upstream development version 2.5.5

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

diff --git a/sources b/sources
index 9c7906f..d3310de 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.5.4.tar.gz) = ea872978eefc9feacb6048bb217449804612e5cc68bfbd1f20e5aaf637ca7ca8be92798ba1cbc1d2d6ddbf6a07628e79beea7db1966150675d9fbda9d4361b7a
-SHA512 (virt-v2v-2.5.4.tar.gz.sig) = 02780e8ae0bdff8c5b22b52bdd24d5f9dfa2d808b792abf7f8bcaa8c4e2c12ea52d3f2cd2c64b8a261437db69409f9ea1d12ac182dbc96e2bb5441a434ac7f84
+SHA512 (virt-v2v-2.5.5.tar.gz) = 06c8ba67cb604387c5aa371815b0be333378eac2bc3672f6f5c61d6914ed93b49d72355a9e549aca1e3f6d4bf07b357b800aa4e30cd7fe14de05d39f1c4a4007
+SHA512 (virt-v2v-2.5.5.tar.gz.sig) = 74397d5d890018ac604d1f563ec2d2298c34dd01b406a90d8e3db52a0f80696938dd7d93a08c93130780a2b6e9f47c74c9eb9be5b7c7c2e0a4fdf72561d40d08
diff --git a/virt-v2v.spec b/virt-v2v.spec
index 56676fc..666390e 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -6,7 +6,7 @@
 
 Name:          virt-v2v
 Epoch:         1
-Version:       2.5.4
+Version:       2.5.5
 Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
@@ -304,6 +304,9 @@ done
 
 
 %changelog
+* Thu Jul 11 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.5-1
+- New upstream development version 2.5.5
+
 * Thu Apr 25 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.4-1
 - New upstream development version 2.5.4
 

From a719f3009f459cf0c4ed36ef7d8279beaeb76b23 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 30 Jul 2024 17:03:30 +0100
Subject: [PATCH 10/16] New upstream development version 2.5.6

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

diff --git a/sources b/sources
index d3310de..8cd4356 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.5.5.tar.gz) = 06c8ba67cb604387c5aa371815b0be333378eac2bc3672f6f5c61d6914ed93b49d72355a9e549aca1e3f6d4bf07b357b800aa4e30cd7fe14de05d39f1c4a4007
-SHA512 (virt-v2v-2.5.5.tar.gz.sig) = 74397d5d890018ac604d1f563ec2d2298c34dd01b406a90d8e3db52a0f80696938dd7d93a08c93130780a2b6e9f47c74c9eb9be5b7c7c2e0a4fdf72561d40d08
+SHA512 (virt-v2v-2.5.6.tar.gz) = 86cc41042518d1ea62627c6fa0605f42dcc397e7ddc3c549bcdc3f54e3703426c14f8b42e102483afb0fad818ff569e1440042c624e9fecf3d04f14233b7a3f5
+SHA512 (virt-v2v-2.5.6.tar.gz.sig) = 39d7fcdb88b1abe325b3f3c2e8bda506fb8ecf41d5adb09e7c6bcd84f881cb73a897c1556735c49e420955ae0cc79614c42930495088d8ae6a3bc0cf39ff93f9
diff --git a/virt-v2v.spec b/virt-v2v.spec
index 666390e..7c5315e 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -6,7 +6,7 @@
 
 Name:          virt-v2v
 Epoch:         1
-Version:       2.5.5
+Version:       2.5.6
 Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
@@ -304,6 +304,9 @@ done
 
 
 %changelog
+* Tue Jul 30 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.6-1
+- New upstream development version 2.5.6
+
 * Thu Jul 11 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.5-1
 - New upstream development version 2.5.5
 

From 5f943ed51683ce85823e41fcf050e8efcecbff5f Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 13 Aug 2024 11:57:34 +0100
Subject: [PATCH 11/16] New upstream development version 2.5.7

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

diff --git a/sources b/sources
index 8cd4356..085af98 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.5.6.tar.gz) = 86cc41042518d1ea62627c6fa0605f42dcc397e7ddc3c549bcdc3f54e3703426c14f8b42e102483afb0fad818ff569e1440042c624e9fecf3d04f14233b7a3f5
-SHA512 (virt-v2v-2.5.6.tar.gz.sig) = 39d7fcdb88b1abe325b3f3c2e8bda506fb8ecf41d5adb09e7c6bcd84f881cb73a897c1556735c49e420955ae0cc79614c42930495088d8ae6a3bc0cf39ff93f9
+SHA512 (virt-v2v-2.5.7.tar.gz) = a0543d3823e29b08c01490040b608dc49d1710ca15498bcd6e8442ed318d42117d04954b044a9db6c9a87d05db700f8d57ffd0cbac540f070cf855cc78bffe5f
+SHA512 (virt-v2v-2.5.7.tar.gz.sig) = f5f4e4e91d79c5852cd421a3af1c2e1d58d832eac96076bc91783944ebc511d4f609d29354096adc5751928248364be57def2aafdb597dd6aa1d16d3a034b4a9
diff --git a/virt-v2v.spec b/virt-v2v.spec
index 7c5315e..3e790fd 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -6,7 +6,7 @@
 
 Name:          virt-v2v
 Epoch:         1
-Version:       2.5.6
+Version:       2.5.7
 Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
@@ -304,6 +304,9 @@ done
 
 
 %changelog
+* Tue Aug 13 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.7-1
+- New upstream development version 2.5.7
+
 * Tue Jul 30 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.6-1
 - New upstream development version 2.5.6
 

From 6f31a41eae7ea63d2be931e25af8ff5a50bbefdb Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 20 Aug 2024 12:19:25 +0100
Subject: [PATCH 12/16] New upstream development version 2.5.8

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

diff --git a/sources b/sources
index 085af98..9789f5b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.5.7.tar.gz) = a0543d3823e29b08c01490040b608dc49d1710ca15498bcd6e8442ed318d42117d04954b044a9db6c9a87d05db700f8d57ffd0cbac540f070cf855cc78bffe5f
-SHA512 (virt-v2v-2.5.7.tar.gz.sig) = f5f4e4e91d79c5852cd421a3af1c2e1d58d832eac96076bc91783944ebc511d4f609d29354096adc5751928248364be57def2aafdb597dd6aa1d16d3a034b4a9
+SHA512 (virt-v2v-2.5.8.tar.gz) = 48540aafe029ae61d6cffa5bb949324646561c73d6d4fdcc2662664b9fdf631239a94a768f82097304f047f2b28025c6fecd083d2a53c168c72ddf68733f3b0a
+SHA512 (virt-v2v-2.5.8.tar.gz.sig) = afc66be86b8e3234c0a0592df7f2ee2a214c9338c0eed19fa4d56db7d680e0c6b0c1766a0790a152378cce2edc60be7111fa8e027223202974e070b7f7939eac
diff --git a/virt-v2v.spec b/virt-v2v.spec
index 3e790fd..7426ce2 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -6,7 +6,7 @@
 
 Name:          virt-v2v
 Epoch:         1
-Version:       2.5.7
+Version:       2.5.8
 Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
@@ -304,6 +304,9 @@ done
 
 
 %changelog
+* Tue Aug 20 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.8-1
+- New upstream development version 2.5.8
+
 * Tue Aug 13 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.7-1
 - New upstream development version 2.5.7
 

From ff6d661e36a11c02542e9389bfbf3b46ee6741f6 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 29 Aug 2024 15:42:16 +0100
Subject: [PATCH 13/16] New upstream development version 2.5.9

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

diff --git a/sources b/sources
index 9789f5b..80b1d9e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.5.8.tar.gz) = 48540aafe029ae61d6cffa5bb949324646561c73d6d4fdcc2662664b9fdf631239a94a768f82097304f047f2b28025c6fecd083d2a53c168c72ddf68733f3b0a
-SHA512 (virt-v2v-2.5.8.tar.gz.sig) = afc66be86b8e3234c0a0592df7f2ee2a214c9338c0eed19fa4d56db7d680e0c6b0c1766a0790a152378cce2edc60be7111fa8e027223202974e070b7f7939eac
+SHA512 (virt-v2v-2.5.9.tar.gz) = 93c557439f69e1ab75ad7caf6bd42e3877aff9454f844dad99d9296bbc2caa45a319ae5688c8f184acd5702cd7e732627591db2ff39292af62a6f61bba76d597
+SHA512 (virt-v2v-2.5.9.tar.gz.sig) = 2d687146ad6d6c3ab9791ac5c064f4f6cfb97209e08a081c51104bf9c3aba5cb9e00689692fd70831caa5c6405b40e5e67b8f4f92ec95200ac3d97dd4c3ce298
diff --git a/virt-v2v.spec b/virt-v2v.spec
index 7426ce2..366441d 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -6,7 +6,7 @@
 
 Name:          virt-v2v
 Epoch:         1
-Version:       2.5.8
+Version:       2.5.9
 Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
@@ -304,6 +304,9 @@ done
 
 
 %changelog
+* Thu Aug 29 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.9-1
+- New upstream development version 2.5.9
+
 * Tue Aug 20 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.8-1
 - New upstream development version 2.5.8
 

From 63c433a3583992302b1d84bb19a4361a03589fef Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 10 Sep 2024 10:53:46 +0100
Subject: [PATCH 14/16] New upstream development version 2.5.10

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

diff --git a/sources b/sources
index 80b1d9e..86e77c6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.5.9.tar.gz) = 93c557439f69e1ab75ad7caf6bd42e3877aff9454f844dad99d9296bbc2caa45a319ae5688c8f184acd5702cd7e732627591db2ff39292af62a6f61bba76d597
-SHA512 (virt-v2v-2.5.9.tar.gz.sig) = 2d687146ad6d6c3ab9791ac5c064f4f6cfb97209e08a081c51104bf9c3aba5cb9e00689692fd70831caa5c6405b40e5e67b8f4f92ec95200ac3d97dd4c3ce298
+SHA512 (virt-v2v-2.5.10.tar.gz) = 3dfe32df4c0a552c2e416cf310bc0f5576b6a9e4e8224437a66ae3779b8beaef2bca60db3ca77f4ccf6c2a1266641c3112b2be9ad5f9492de234b69e7c43be6d
+SHA512 (virt-v2v-2.5.10.tar.gz.sig) = 74ddedf4b9d999ee0f8b631a684b8edee5ea52f579f779863373b35bf778fc42f4dd07566251a0e748b65b4285c5c3dfe9006935bd7815a78bb0eb6ef8638ef4
diff --git a/virt-v2v.spec b/virt-v2v.spec
index 366441d..0d32f9a 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -6,7 +6,7 @@
 
 Name:          virt-v2v
 Epoch:         1
-Version:       2.5.9
+Version:       2.5.10
 Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
@@ -304,6 +304,9 @@ done
 
 
 %changelog
+* Tue Sep 10 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.10-1
+- New upstream development version 2.5.10
+
 * Thu Aug 29 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.9-1
 - New upstream development version 2.5.9
 

From 09f3e17e77b74ae1e69a13c21ed498f93670f92f Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 3 Oct 2024 13:22:26 +0100
Subject: [PATCH 15/16] New upstream development version 2.5.11

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

diff --git a/sources b/sources
index 86e77c6..4a90e65 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.5.10.tar.gz) = 3dfe32df4c0a552c2e416cf310bc0f5576b6a9e4e8224437a66ae3779b8beaef2bca60db3ca77f4ccf6c2a1266641c3112b2be9ad5f9492de234b69e7c43be6d
-SHA512 (virt-v2v-2.5.10.tar.gz.sig) = 74ddedf4b9d999ee0f8b631a684b8edee5ea52f579f779863373b35bf778fc42f4dd07566251a0e748b65b4285c5c3dfe9006935bd7815a78bb0eb6ef8638ef4
+SHA512 (virt-v2v-2.5.11.tar.gz) = 275529228b6d1cb630ee84053d5c77ee984eb60521d2079ec364a3fa529e77ff628c340de6ad0b1e29b43b06a2004df07e929a3e3f0bd47f7d84d8ca5e803ca5
+SHA512 (virt-v2v-2.5.11.tar.gz.sig) = cc6298fecce15a319756188ea41eabd4177ae16144416aa7ded3dbb0a0bb24611f8f2dc35c5f263163b9050fc2406f427a9004f38f94bddbbdf3750033ba3871
diff --git a/virt-v2v.spec b/virt-v2v.spec
index 0d32f9a..aeab8f1 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -6,7 +6,7 @@
 
 Name:          virt-v2v
 Epoch:         1
-Version:       2.5.10
+Version:       2.5.11
 Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
@@ -282,9 +282,7 @@ done
 %{_mandir}/man1/virt-v2v-output-rhv.1*
 %endif
 %{_mandir}/man1/virt-v2v-release-notes-1.42.1*
-%{_mandir}/man1/virt-v2v-release-notes-2.0.1*
-%{_mandir}/man1/virt-v2v-release-notes-2.2.1*
-%{_mandir}/man1/virt-v2v-release-notes-2.4.1*
+%{_mandir}/man1/virt-v2v-release-notes-2.*.1*
 %{_mandir}/man1/virt-v2v-support.1*
 
 
@@ -304,6 +302,9 @@ done
 
 
 %changelog
+* Thu Oct 03 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.11-1
+- New upstream development version 2.5.11
+
 * Tue Sep 10 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.10-1
 - New upstream development version 2.5.10
 

From 4dac46786348fc86e7e0038ccb439c6cc68e80ae Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 8 Oct 2024 15:00:56 +0100
Subject: [PATCH 16/16] New upstream stable version 2.6.0

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

diff --git a/sources b/sources
index 4a90e65..2a2aa81 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.5.11.tar.gz) = 275529228b6d1cb630ee84053d5c77ee984eb60521d2079ec364a3fa529e77ff628c340de6ad0b1e29b43b06a2004df07e929a3e3f0bd47f7d84d8ca5e803ca5
-SHA512 (virt-v2v-2.5.11.tar.gz.sig) = cc6298fecce15a319756188ea41eabd4177ae16144416aa7ded3dbb0a0bb24611f8f2dc35c5f263163b9050fc2406f427a9004f38f94bddbbdf3750033ba3871
+SHA512 (virt-v2v-2.6.0.tar.gz) = bc7ecf99e66bae057eaf5d7c82ca38ded4aa6ef8732544bc7079f2894c9c79542a415fede02cf8c2cb7e83756683457c705f816b1da57e5ca9565350b9376a73
+SHA512 (virt-v2v-2.6.0.tar.gz.sig) = 630166caf41d48ac2efca646611248263e58a4e7e644a7606b647911164a39a449ae3916d05248d48e80925f3f9179b1cfb850001b0f3dd30a48c301d62b11a0
diff --git a/virt-v2v.spec b/virt-v2v.spec
index aeab8f1..c0a2e7b 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.5-development
+%global source_directory 2.6-stable
 
 Name:          virt-v2v
 Epoch:         1
-Version:       2.5.11
+Version:       2.6.0
 Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
@@ -302,6 +302,9 @@ done
 
 
 %changelog
+* Tue Oct 08 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.6.0-1
+- New upstream stable version 2.6.0
+
 * Thu Oct 03 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.11-1
 - New upstream development version 2.5.11