Fix virt-v2v --version output resolves: RHEL-22262

.virt-v2v.metadata

@@ -0,0 +1,2 @@
+52029cc7c3f9e05ec9685995ad86955154d7b28e virt-v2v-2.4.0.tar.gz
+89c2a4028b3d8be66cb6317f72f4e46072aea55a virt-v2v-2.4.0.tar.gz.sig

0015-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch

@@ -1,4 +1,4 @@
-From 77924fa409b5239615a797646eb293ab412d5ae1 Mon Sep 17 00:00:00 2001
+From 5bdd4525570d58e7b712514f1ab57cb04f7cd8d8 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sun, 28 Sep 2014 19:14:43 +0100
 Subject: [PATCH] RHEL: v2v: Select correct qemu binary for -o qemu mode

0015-Version-2.5.1.patch

@@ -1,132 +0,0 @@
-From 2d2ee75166abd6ccae28b71f474b734341997e63 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Thu, 18 Jan 2024 17:25:54 +0000
-Subject: [PATCH] Version 2.5.1.
-
----
- configure.ac    |  4 ++--
- po/POTFILES-ml  |  1 +
- po/virt-v2v.pot | 22 +++++++++++-----------
- 3 files changed, 14 insertions(+), 13 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 622563ff..2e630d87 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -19,8 +19,8 @@
- # add extra information using --with-extra="..." which may be any
- # freeform string.
- m4_define([v2v_major],   [2])
--m4_define([v2v_minor],   [4])
--m4_define([v2v_release], [0])
-+m4_define([v2v_minor],   [5])
-+m4_define([v2v_release], [1])
- 
- AC_INIT([virt-v2v],v2v_major.v2v_minor.v2v_release)
- 
-diff --git a/po/POTFILES-ml b/po/POTFILES-ml
-index 5b0f99aa..ec98cecf 100644
---- a/po/POTFILES-ml
-+++ b/po/POTFILES-ml
-@@ -52,6 +52,7 @@ input/nbdkit_vddk.ml
- input/parse_domain_from_vmx.ml
- input/parse_libvirt_xml.ml
- input/parse_vmx.ml
-+input/ssh.ml
- input/vCenter.ml
- inspector/inspector.ml
- lib/YAML.ml
-diff --git a/po/virt-v2v.pot b/po/virt-v2v.pot
-index 4c6334ee..ad814ad8 100644
---- a/po/virt-v2v.pot
-+++ b/po/virt-v2v.pot
-@@ -6,10 +6,10 @@
- #, fuzzy
- msgid ""
- msgstr ""
--"Project-Id-Version: virt-v2v 2.4.0\n"
-+"Project-Id-Version: virt-v2v 2.5.1\n"
- "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
- "component=libguestfs&product=Virtualization+Tools\n"
--"POT-Creation-Date: 2024-01-04 17:06+0000\n"
-+"POT-Creation-Date: 2024-01-18 17:14+0000\n"
- "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
- "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
- "Language-Team: LANGUAGE <LL@li.org>\n"
-@@ -203,11 +203,11 @@ msgid ""
- "-i ova: invalid OVA file: path ‘%s’ references a file outside the archive"
- msgstr ""
- 
--#: input/input_vmx.ml:53
-+#: input/input_vmx.ml:57
- msgid "-i vmx: cannot use -it vddk in this input mode"
- msgstr ""
- 
--#: input/input_vmx.ml:56
-+#: input/input_vmx.ml:60
- msgid "-i vmx: expecting a VMX file or ssh:// URI"
- msgstr ""
- 
-@@ -993,7 +993,7 @@ msgid ""
- "require a separate password to connect."
- msgstr ""
- 
--#: input/input_vmx.ml:89
-+#: input/input_vmx.ml:107
- msgid ""
- "This transport does not support guests with snapshots. Either collapse the "
- "snapshots for this guest and try the conversion again, or use one of the "
-@@ -1171,7 +1171,7 @@ msgstr ""
- msgid "could not add grub2 serial console (ignored)"
- msgstr ""
- 
--#: input/parse_domain_from_vmx.ml:85
-+#: input/ssh.ml:52
- msgid ""
- "could not copy the VMX file from the remote server, see earlier error "
- "messages"
-@@ -1505,7 +1505,7 @@ msgstr ""
- msgid "invalid -n/--network parameter"
- msgstr ""
- 
--#: input/parse_domain_from_vmx.ml:440
-+#: input/parse_domain_from_vmx.ml:402
- msgid "invalid cpuid.coresPerSocket < number of vCPUs"
- msgstr ""
- 
-@@ -1678,7 +1678,7 @@ msgstr ""
- msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ %s"
- msgstr ""
- 
--#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:39 input/nbdkit_curl.ml:32
-+#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:38 input/nbdkit_curl.ml:32
- msgid "nbdkit is too old.  nbdkit >= %d.%d.%d is required."
- msgstr ""
- 
-@@ -1751,7 +1751,7 @@ msgstr ""
- msgid "no bootloader detected"
- msgstr ""
- 
--#: input/parse_domain_from_vmx.ml:400
-+#: input/parse_domain_from_vmx.ml:359
- msgid "no displayName key found in VMX file"
- msgstr ""
- 
-@@ -2116,7 +2116,7 @@ msgstr ""
- msgid "unknown block driver ‘--block-driver %s’"
- msgstr ""
- 
--#: input/parse_domain_from_vmx.ml:453
-+#: input/parse_domain_from_vmx.ml:415
- msgid "unknown firmware value '%s', assuming BIOS"
- msgstr ""
- 
-@@ -2128,7 +2128,7 @@ msgstr ""
- msgid "unknown input transport ‘-it %s’"
- msgstr ""
- 
--#: input/parse_domain_from_vmx.ml:462
-+#: input/parse_domain_from_vmx.ml:424
- msgid "unknown sound device '%s' ignored"
- msgstr ""
- 

0016-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch

@@ -1,4 +1,4 @@
-From fce209290507857a5e26f4bf153f42f0a95f2a48 Mon Sep 17 00:00:00 2001
+From f063d97be8f13cc6526d3a4b4ec8be0b1d3c266f Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 30 Sep 2014 10:50:27 +0100
 Subject: [PATCH] RHEL: v2v: Disable the --qemu-boot / -oo qemu-boot option

0017-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch

@@ -1,4 +1,4 @@
-From 9b3d4513662f52a17c61468efcb9ec9d3915612f Mon Sep 17 00:00:00 2001
+From 6cee48bde007be6c8242c9e1a3b83bc153c566d9 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 24 Apr 2015 09:45:41 -0400
 Subject: [PATCH] RHEL: Fix list of supported sound cards to match RHEL qemu

0018-RHEL-Fixes-for-libguestfs-winsupport.patch

@@ -1,4 +1,4 @@
-From 0c24b94cc16c51a72d927a534af446b9b21f30b5 Mon Sep 17 00:00:00 2001
+From 7374efa8aecb97a83a1ec6d4d606651a4eb569e4 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sun, 30 Aug 2015 03:21:57 -0400
 Subject: [PATCH] RHEL: Fixes for libguestfs-winsupport.

0019-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch

@@ -1,4 +1,4 @@
-From 943c16948ef5fd7adee045875e52e5d3202eca09 Mon Sep 17 00:00:00 2001
+From 8b2bb3c153b44634fb3f93aae1c0c40655213506 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 2 Mar 2017 14:21:37 +0100
 Subject: [PATCH] RHEL: v2v: -i disk: force VNC as display (RHBZ#1372671)

0020-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch

@@ -1,4 +1,4 @@
-From 2a1a6cb793ee4d0840ef51ee97d77242960660d4 Mon Sep 17 00:00:00 2001
+From 28e3b929b94e213bc24fa27c58215fe8ccdb9ba1 Mon Sep 17 00:00:00 2001
 From: Pino Toscano <ptoscano@redhat.com>
 Date: Wed, 8 Mar 2017 11:03:40 +0100
 Subject: [PATCH] RHEL: v2v: do not mention SUSE Xen hosts (RHBZ#1430203)

0021-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch

@@ -1,4 +1,4 @@
-From 07242da3ffd27a686bfe9913d8eb9a8d6a9881d8 Mon Sep 17 00:00:00 2001
+From a2e7cf38ee640e9e806a680cf55f78d33a3c0ee8 Mon Sep 17 00:00:00 2001
 From: Pino Toscano <ptoscano@redhat.com>
 Date: Tue, 26 Mar 2019 09:42:25 +0100
 Subject: [PATCH] RHEL: point to KB for supported v2v hypervisors/guests

0022-RHEL-Disable-o-glance.patch

@@ -1,4 +1,4 @@
-From 330933e88be20150a3caf1d03e565cbefa79bbb8 Mon Sep 17 00:00:00 2001
+From 29b43856a1429148eece11f0579a01026d583161 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Wed, 30 Jun 2021 11:15:52 +0100
 Subject: [PATCH] RHEL: Disable -o glance

0023-RHEL-Remove-the-in-place-option.patch

@@ -1,4 +1,4 @@
-From 817143c2e72f2f269caf4bc40cd78f8c2733d27f Mon Sep 17 00:00:00 2001
+From cbebfa10e481a664a949ff07dfceca5cb45793df Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 2 Dec 2021 11:56:05 +0000
 Subject: [PATCH] RHEL: Remove the --in-place option

0024-RHEL-9-oo-compressed-Remove-nbdcopy-version-check-an.patch

@@ -1,4 +1,4 @@
-From 0395abbc0a3b5286cdef040b8c8d484b8716fb7c Mon Sep 17 00:00:00 2001
+From aec57da776543ede26a2f751594686ad36b51bad Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 5 Jul 2022 11:56:54 +0100
 Subject: [PATCH] RHEL 9: -oo compressed: Remove nbdcopy version check and test

0025-RHEL-9-tests-Remove-btrfs-test.patch

@@ -1,4 +1,4 @@
-From ab52795e1b6834bb682682a7df07e1ad0baf9be6 Mon Sep 17 00:00:00 2001
+From d9c11fcfdf832f9d3d35855e7e7458efc1908515 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 5 Jul 2022 11:58:09 +0100
 Subject: [PATCH] RHEL 9: tests: Remove btrfs test

0026-RHEL-9-Remove-block-driver-option.patch

@@ -1,4 +1,4 @@
-From cf1a9ba127ae581d42b309c6112f67c5e7edbfd2 Mon Sep 17 00:00:00 2001
+From 3e2962dad1245b8c7d1255faaa6820adc0648d14 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 28 Apr 2023 12:28:19 +0100
 Subject: [PATCH] RHEL 9: Remove --block-driver option

virt-v2v.spec

@@ -16,7 +16,7 @@
 Name:          virt-v2v
 Epoch:         1
 Version:       2.4.0
-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
@@ -50,19 +50,18 @@ Patch0011:     0011-input-ssh-Rearrange-parameters-specifying-ssh-server.patch
 Patch0012:     0012-docs-Remove-paragraph-about-ip-passwords-and-ssh-scp.patch
 Patch0013:     0013-input-ssh-Use-nbdinfo-can-connect-instead-of-size.patch
 Patch0014:     0014-build-Document-that-nbdinfo-and-nbdcopy-are-required.patch
-Patch0015:     0015-Version-2.5.1.patch
-Patch0016:     0016-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch
-Patch0017:     0017-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch
-Patch0018:     0018-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch
-Patch0019:     0019-RHEL-Fixes-for-libguestfs-winsupport.patch
-Patch0020:     0020-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
-Patch0021:     0021-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch
-Patch0022:     0022-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
-Patch0023:     0023-RHEL-Disable-o-glance.patch
-Patch0024:     0024-RHEL-Remove-the-in-place-option.patch
-Patch0025:     0025-RHEL-9-oo-compressed-Remove-nbdcopy-version-check-an.patch
-Patch0026:     0026-RHEL-9-tests-Remove-btrfs-test.patch
-Patch0027:     0027-RHEL-9-Remove-block-driver-option.patch
+Patch0015:     0015-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch
+Patch0016:     0016-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch
+Patch0017:     0017-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch
+Patch0018:     0018-RHEL-Fixes-for-libguestfs-winsupport.patch
+Patch0019:     0019-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
+Patch0020:     0020-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch
+Patch0021:     0021-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
+Patch0022:     0022-RHEL-Disable-o-glance.patch
+Patch0023:     0023-RHEL-Remove-the-in-place-option.patch
+Patch0024:     0024-RHEL-9-oo-compressed-Remove-nbdcopy-version-check-an.patch
+Patch0025:     0025-RHEL-9-tests-Remove-btrfs-test.patch
+Patch0026:     0026-RHEL-9-Remove-block-driver-option.patch
 
 %if !0%{?rhel}
 # libguestfs hasn't been built on i686 for a while since there is no
@@ -367,7 +366,7 @@ make -C tests TESTS=test-v2v-fedora-luks-on-lvm-conversion.sh check
 
 
 %changelog
-* Thu Jan 18 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.4.0-1
+* Mon Jan 22 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.4.0-2
 - Rebase to virt-v2v 2.4.0
 - -it ssh: Double quote ssh command which tests remote file exists
   resolves: RHEL-12105
@@ -379,6 +378,8 @@ make -C tests TESTS=test-v2v-fedora-luks-on-lvm-conversion.sh check
   resolves: RHEL-19564
 - Fix -i vmx when remote filename contains literal '*'
   resolves: RHEL-21365
+- Fix virt-v2v --version output
+  resolves: RHEL-22262
 
 * Mon Jul 03 2023 Laszlo Ersek <lersek@redhat.com> - 1:2.3.4-5
 - improve UX when running as root and we can't chown v2v tmpdir or socks