From ef7323ad39da8e28a829582d0912d63191c95be2 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 11 Apr 2024 18:04:57 +0100 Subject: [PATCH 01/93] 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 - 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 - 1:2.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 5d4370f7888a20b2b953ad92db59dc4999b4df61 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 12 Apr 2024 22:12:58 +0100 Subject: [PATCH 02/93] Fix bytecode compilation (RHBZ#2274708) --- ...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 +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 97966eb..74d7c31 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 c087ce454eb4da068dc2d6e10c19378b7862a2e9 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 12 Apr 2024 22:15:18 +0100 Subject: [PATCH 03/93] Bump release - Fix bytecode compilation (RHBZ#2274708) --- virt-v2v.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 74d7c31..3e1db3d 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 - 1:2.5.3-2 +- Fix bytecode compilation (RHBZ#2274708) + * Thu Apr 11 2024 Richard W.M. Jones - 1:2.5.3-1 - New development branch version 2.5.3 - Unconditionally run autoreconf. From bfa658401ff451dec396756ce65e13906654a6bf Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 12 Apr 2024 22:12:58 +0100 Subject: [PATCH 04/93] 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 +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" Date: Fri, 12 Apr 2024 22:15:18 +0100 Subject: [PATCH 05/93] 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 - 1:2.5.3-2 +- Fix bytecode compilation (RHBZ#2274708) + * Thu Apr 11 2024 Richard W.M. Jones - 1:2.5.3-1 - New development branch version 2.5.3 - Unconditionally run autoreconf. From 6084b1f112d62ae9f28a47e877b755b84a6f2a18 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 16 Apr 2024 13:02:33 +0100 Subject: [PATCH 06/93] gating: Match any version of RHEL --- 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 328cb530d44fdb26e47a854c3d67dea9e5c7f904 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 16 Apr 2024 13:02:33 +0100 Subject: [PATCH 07/93] 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 8aab9f5c68fc11366152d0b98676d91544c997d8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 25 Apr 2024 15:23:35 +0100 Subject: [PATCH 08/93] New upstream development version 2.5.4 --- ...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 -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 3e1db3d..135d2ac 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 - 1:2.5.4-1 +- New upstream development version 2.5.4 + * Fri Apr 12 2024 Richard W.M. Jones - 1:2.5.3-2 - Fix bytecode compilation (RHBZ#2274708) From 7fb40c9e669e66bfb83103c3230a522f8d4e5f3d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 25 Apr 2024 15:23:35 +0100 Subject: [PATCH 09/93] 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 -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 - 1:2.5.4-1 +- New upstream development version 2.5.4 + * Fri Apr 12 2024 Richard W.M. Jones - 1:2.5.3-2 - Fix bytecode compilation (RHBZ#2274708) From 8b3ce3589904d3514618751ff940c2f93149e599 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 29 May 2024 22:39:22 +0100 Subject: [PATCH 10/93] OCaml 5.2.0 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 135d2ac..d4a2486 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -7,7 +7,7 @@ Name: virt-v2v Epoch: 1 Version: 2.5.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 @@ -297,6 +297,9 @@ done %changelog +* Wed May 29 2024 Richard W.M. Jones - 1:2.5.4-2 +- OCaml 5.2.0 for Fedora 41 + * Thu Apr 25 2024 Richard W.M. Jones - 1:2.5.4-1 - New upstream development version 2.5.4 From 5c0984165191c0758931c85b0ff848100a486881 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 19 Jun 2024 17:00:53 +0100 Subject: [PATCH 11/93] OCaml 5.2.0 ppc64le fix --- virt-v2v.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index d4a2486..d53c07c 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -7,7 +7,7 @@ Name: virt-v2v Epoch: 1 Version: 2.5.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -297,6 +297,9 @@ done %changelog +* Wed Jun 19 2024 Richard W.M. Jones - 1:2.5.4-3 +- OCaml 5.2.0 ppc64le fix + * Wed May 29 2024 Richard W.M. Jones - 1:2.5.4-2 - OCaml 5.2.0 for Fedora 41 From f722fff7336eab416641291ba753b50a9375a836 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 19 Jun 2024 17:55:42 +0100 Subject: [PATCH 12/93] 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. --- virt-v2v.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/virt-v2v.spec b/virt-v2v.spec index d53c07c..ec9a263 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 41bc8532d0c2dd6ee325d8579db7d231afc46cfe Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 8 Jul 2024 10:38:25 +0100 Subject: [PATCH 13/93] 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 --- virt-v2v.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index ec9a263..ba74fbd 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 37f4f2f35dc14de187f53abc82c0e0054c315243 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 9 Jul 2024 11:25:24 +0100 Subject: [PATCH 14/93] 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 --- virt-v2v.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index ba74fbd..3ea2d2c 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 4ca1dbba4b7aba2b9eb4fc93a7a740922524e958 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 11 Jul 2024 12:28:07 +0100 Subject: [PATCH 15/93] New upstream development version 2.5.5 --- sources | 4 ++-- virt-v2v.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 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 3ea2d2c..4a55552 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -6,8 +6,8 @@ Name: virt-v2v Epoch: 1 -Version: 2.5.4 -Release: 3%{?dist} +Version: 2.5.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 @@ -304,6 +304,9 @@ done %changelog +* Thu Jul 11 2024 Richard W.M. Jones - 1:2.5.5-1 +- New upstream development version 2.5.5 + * Wed Jun 19 2024 Richard W.M. Jones - 1:2.5.4-3 - OCaml 5.2.0 ppc64le fix From b5d900adb3cf495add4002f5be1a07d284ce6b5c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 19 Jun 2024 17:55:42 +0100 Subject: [PATCH 16/93] 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" Date: Mon, 8 Jul 2024 10:38:25 +0100 Subject: [PATCH 17/93] 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" Date: Tue, 9 Jul 2024 11:25:24 +0100 Subject: [PATCH 18/93] 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" Date: Thu, 11 Jul 2024 12:28:07 +0100 Subject: [PATCH 19/93] 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 - 1:2.5.5-1 +- New upstream development version 2.5.5 + * Thu Apr 25 2024 Richard W.M. Jones - 1:2.5.4-1 - New upstream development version 2.5.4 From 0a9c525871cdf5b77b751c7f82b82e68effac836 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 11 Jul 2024 12:46:58 +0100 Subject: [PATCH 20/93] Fix basic test on RHEL 10 --- tests/basic-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/basic-test.sh b/tests/basic-test.sh index 17fc7c3..71929e0 100755 --- a/tests/basic-test.sh +++ b/tests/basic-test.sh @@ -7,7 +7,7 @@ set -x # team using a mix of automated and manual testing. # Fix libvirt. -systemctl restart libvirtd +systemctl restart virtqemud virtsecretd virtstoraged virtnetworkd virt-builder fedora-30 virt-v2v -i disk fedora-30.img -o null From fec9e2b674bb95fbc3c3d37262fda4e8ceb986e8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 17 Jul 2024 11:51:23 +0100 Subject: [PATCH 21/93] Remove python dependencies for RHEL 10 Only used by -o rhv-upload which has been removed. --- virt-v2v.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 4a55552..8341ec4 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -80,7 +80,9 @@ BuildRequires: %{_bindir}/nbdcopy BuildRequires: %{_bindir}/nbdinfo BuildRequires: nbdkit-file-plugin BuildRequires: nbdkit-null-plugin +%if !0%{?rhel} BuildRequires: nbdkit-python-plugin +%endif BuildRequires: nbdkit-cow-filter >= 1.28.3-1.el9 BuildRequires: mingw-srvany-redistributable >= 1.1-6 %ifarch x86_64 @@ -118,10 +120,11 @@ Requires: edk2-ovmf Requires: edk2-aarch64 %endif -%if 0%{?rhel} != 8 +%if !0%{?rhel} Requires: python3 -%else +%elif %{?rhel} == 9 Requires: platform-python +# Python is not needed by RHEL 10. %endif Requires: libnbd >= 1.10 Requires: %{_bindir}/qemu-nbd @@ -132,7 +135,9 @@ Requires: nbdkit-curl-plugin Requires: nbdkit-file-plugin Requires: nbdkit-nbd-plugin Requires: nbdkit-null-plugin +%if !0%{?rhel} Requires: nbdkit-python-plugin +%endif Requires: nbdkit-ssh-plugin %ifarch x86_64 Requires: nbdkit-vddk-plugin From 6b78c8afd5070c21cec3ccac88956f3ad6b23249 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:53:08 +0000 Subject: [PATCH 22/93] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- virt-v2v.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 8341ec4..3ce3f15 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -7,7 +7,7 @@ Name: virt-v2v Epoch: 1 Version: 2.5.5 -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 @@ -309,6 +309,9 @@ done %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1:2.5.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jul 11 2024 Richard W.M. Jones - 1:2.5.5-1 - New upstream development version 2.5.5 From c3753c426c7cf96745770819dac1ca52ce138c39 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 22 Jul 2024 15:01:48 +0100 Subject: [PATCH 23/93] Depend on /usr/bin/python3 instead of python3 for -o rhv-upload scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/#_dependencies Thanks: Miro Hrončok --- virt-v2v.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 3ce3f15..9061b00 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -121,7 +121,7 @@ Requires: edk2-aarch64 %endif %if !0%{?rhel} -Requires: python3 +Requires: /usr/bin/python3 %elif %{?rhel} == 9 Requires: platform-python # Python is not needed by RHEL 10. From fe16fdb390579f4aff2abd03fcbf7963fb5c8b3c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 30 Jul 2024 17:03:30 +0100 Subject: [PATCH 24/93] New upstream development version 2.5.6 --- sources | 4 ++-- virt-v2v.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 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 9061b00..fbd233b 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -6,8 +6,8 @@ Name: virt-v2v Epoch: 1 -Version: 2.5.5 -Release: 2%{?dist} +Version: 2.5.6 +Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -309,6 +309,9 @@ done %changelog +* Tue Jul 30 2024 Richard W.M. Jones - 1:2.5.6-1 +- New upstream development version 2.5.6 + * Sat Jul 20 2024 Fedora Release Engineering - 1:2.5.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From a719f3009f459cf0c4ed36ef7d8279beaeb76b23 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 30 Jul 2024 17:03:30 +0100 Subject: [PATCH 25/93] 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 - 1:2.5.6-1 +- New upstream development version 2.5.6 + * Thu Jul 11 2024 Richard W.M. Jones - 1:2.5.5-1 - New upstream development version 2.5.5 From c7a2f1f49aec901277541c5e26e6b6b1ffcc8c01 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 13 Aug 2024 11:57:34 +0100 Subject: [PATCH 26/93] New upstream development version 2.5.7 --- 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 fbd233b..60f55a3 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 @@ -309,6 +309,9 @@ done %changelog +* Tue Aug 13 2024 Richard W.M. Jones - 1:2.5.7-1 +- New upstream development version 2.5.7 + * Tue Jul 30 2024 Richard W.M. Jones - 1:2.5.6-1 - New upstream development version 2.5.6 From 5f943ed51683ce85823e41fcf050e8efcecbff5f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 13 Aug 2024 11:57:34 +0100 Subject: [PATCH 27/93] 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 - 1:2.5.7-1 +- New upstream development version 2.5.7 + * Tue Jul 30 2024 Richard W.M. Jones - 1:2.5.6-1 - New upstream development version 2.5.6 From 8935660aa2368d661fc0694970dc84e2c552796b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 20 Aug 2024 12:19:25 +0100 Subject: [PATCH 28/93] New upstream development version 2.5.8 --- 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 60f55a3..a4ad46a 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 @@ -309,6 +309,9 @@ done %changelog +* Tue Aug 20 2024 Richard W.M. Jones - 1:2.5.8-1 +- New upstream development version 2.5.8 + * Tue Aug 13 2024 Richard W.M. Jones - 1:2.5.7-1 - New upstream development version 2.5.7 From 6f31a41eae7ea63d2be931e25af8ff5a50bbefdb Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 20 Aug 2024 12:19:25 +0100 Subject: [PATCH 29/93] 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 - 1:2.5.8-1 +- New upstream development version 2.5.8 + * Tue Aug 13 2024 Richard W.M. Jones - 1:2.5.7-1 - New upstream development version 2.5.7 From 325d55230c464e058edd559bcb020fa04bbdd1a3 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 29 Aug 2024 15:42:16 +0100 Subject: [PATCH 30/93] New upstream development version 2.5.9 --- 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 a4ad46a..5439ee8 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 @@ -309,6 +309,9 @@ done %changelog +* Thu Aug 29 2024 Richard W.M. Jones - 1:2.5.9-1 +- New upstream development version 2.5.9 + * Tue Aug 20 2024 Richard W.M. Jones - 1:2.5.8-1 - New upstream development version 2.5.8 From ff6d661e36a11c02542e9389bfbf3b46ee6741f6 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 29 Aug 2024 15:42:16 +0100 Subject: [PATCH 31/93] 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 - 1:2.5.9-1 +- New upstream development version 2.5.9 + * Tue Aug 20 2024 Richard W.M. Jones - 1:2.5.8-1 - New upstream development version 2.5.8 From 0cc7156fdfd6b900d6c6a468f5eab4730a49fdd3 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 10 Sep 2024 10:53:46 +0100 Subject: [PATCH 32/93] New upstream development version 2.5.10 --- 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 5439ee8..63b3f49 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 @@ -309,6 +309,9 @@ done %changelog +* Tue Sep 10 2024 Richard W.M. Jones - 1:2.5.10-1 +- New upstream development version 2.5.10 + * Thu Aug 29 2024 Richard W.M. Jones - 1:2.5.9-1 - New upstream development version 2.5.9 From 63c433a3583992302b1d84bb19a4361a03589fef Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 10 Sep 2024 10:53:46 +0100 Subject: [PATCH 33/93] 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 - 1:2.5.10-1 +- New upstream development version 2.5.10 + * Thu Aug 29 2024 Richard W.M. Jones - 1:2.5.9-1 - New upstream development version 2.5.9 From 90d18ab510a2403cfc634056ca9c17584196d7be Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 10 Sep 2024 23:16:25 -0400 Subject: [PATCH 34/93] Fix ELN build These manpages are excludes in %files, as these features are not supported on RHEL. --- virt-v2v.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/virt-v2v.spec b/virt-v2v.spec index 63b3f49..8c2576f 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -232,6 +232,9 @@ find $RPM_BUILD_ROOT -name '*.la' -delete 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* +# 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* %endif # Find locale files. From ff66613be20c4af9a93e4f9b43a9635d077948de Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 3 Oct 2024 13:22:26 +0100 Subject: [PATCH 35/93] New upstream development version 2.5.11 --- 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 8c2576f..b21901c 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 @@ -290,9 +290,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* @@ -312,6 +310,9 @@ done %changelog +* Thu Oct 03 2024 Richard W.M. Jones - 1:2.5.11-1 +- New upstream development version 2.5.11 + * Tue Sep 10 2024 Richard W.M. Jones - 1:2.5.10-1 - New upstream development version 2.5.10 From 09f3e17e77b74ae1e69a13c21ed498f93670f92f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 3 Oct 2024 13:22:26 +0100 Subject: [PATCH 36/93] 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 - 1:2.5.11-1 +- New upstream development version 2.5.11 + * Tue Sep 10 2024 Richard W.M. Jones - 1:2.5.10-1 - New upstream development version 2.5.10 From a53ed8e5fc9a76fa7689ea81a22ca660b5d77603 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 8 Oct 2024 15:00:56 +0100 Subject: [PATCH 37/93] New upstream stable version 2.6.0 --- 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 b21901c..9bd1e65 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 @@ -310,6 +310,9 @@ done %changelog +* Tue Oct 08 2024 Richard W.M. Jones - 1:2.6.0-1 +- New upstream stable version 2.6.0 + * Thu Oct 03 2024 Richard W.M. Jones - 1:2.5.11-1 - New upstream development version 2.5.11 From 4dac46786348fc86e7e0038ccb439c6cc68e80ae Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 8 Oct 2024 15:00:56 +0100 Subject: [PATCH 38/93] 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 - 1:2.6.0-1 +- New upstream stable version 2.6.0 + * Thu Oct 03 2024 Richard W.M. Jones - 1:2.5.11-1 - New upstream development version 2.5.11 From 6fddb7b7d939d6053247e535e3f2b4460fec3eb1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 22 Oct 2024 13:41:23 +0100 Subject: [PATCH 39/93] Rebuild for Jansson 2.14 (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/3PYINSQGKQ4BB25NQUI2A2UCGGLAG5ND/) --- virt-v2v.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 9bd1e65..cc7aa74 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -7,7 +7,7 @@ Name: virt-v2v Epoch: 1 Version: 2.6.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 @@ -310,6 +310,10 @@ done %changelog +* Tue Oct 22 2024 Richard W.M. Jones - 1:2.6.0-2 +- Rebuild for Jansson 2.14 + (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/3PYINSQGKQ4BB25NQUI2A2UCGGLAG5ND/) + * Tue Oct 08 2024 Richard W.M. Jones - 1:2.6.0-1 - New upstream stable version 2.6.0 From c28b7c26fcdafa0c4294311c7ddf59e1cf5206d3 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 22 Oct 2024 17:53:22 +0100 Subject: [PATCH 40/93] New upstream development version 2.7.1 Replace jansson with json-c --- sources | 4 ++-- virt-v2v.spec | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/sources b/sources index 2a2aa81..09dd863 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-2.6.0.tar.gz) = bc7ecf99e66bae057eaf5d7c82ca38ded4aa6ef8732544bc7079f2894c9c79542a415fede02cf8c2cb7e83756683457c705f816b1da57e5ca9565350b9376a73 -SHA512 (virt-v2v-2.6.0.tar.gz.sig) = 630166caf41d48ac2efca646611248263e58a4e7e644a7606b647911164a39a449ae3916d05248d48e80925f3f9179b1cfb850001b0f3dd30a48c301d62b11a0 +SHA512 (virt-v2v-2.7.1.tar.gz) = 11f5528a48208050fda9c64c8aa6dcfd28352e26c96f15059ef66230577e87cae79286dbe035ee5fdf3c43398cba1f94569e11ff3871b26f21e7a6265a4bfa6d +SHA512 (virt-v2v-2.7.1.tar.gz.sig) = a73bce78f116f68565e1288c130c0ea4adc4e1d87174f72fc9aeff747c541afd16404d59d12d0431d50b83a9d0dbe5ff12dddbfed97d2e1d431212a895078cad diff --git a/virt-v2v.spec b/virt-v2v.spec index cc7aa74..641acbf 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -2,12 +2,12 @@ %global verify_tarball_signature 1 # The source directory. -%global source_directory 2.6-stable +%global source_directory 2.7-development Name: virt-v2v Epoch: 1 -Version: 2.6.0 -Release: 2%{?dist} +Version: 2.7.1 +Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -51,7 +51,7 @@ BuildRequires: augeas-devel BuildRequires: bash-completion, bash-completion-devel BuildRequires: file-devel BuildRequires: gettext-devel -BuildRequires: jansson-devel +BuildRequires: json-c-devel BuildRequires: libnbd-devel BuildRequires: libosinfo-devel BuildRequires: libvirt-daemon-kvm @@ -310,6 +310,10 @@ done %changelog +* Tue Oct 22 2024 Richard W.M. Jones - 1:2.7.1-1 +- New upstream development version 2.7.1 +- Replace jansson with json-c + * Tue Oct 22 2024 Richard W.M. Jones - 1:2.6.0-2 - Rebuild for Jansson 2.14 (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/3PYINSQGKQ4BB25NQUI2A2UCGGLAG5ND/) From 501cdb20ae8ee363a10c742359b631335e5eb03f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 18 Nov 2024 14:52:32 +0000 Subject: [PATCH 41/93] New upstream development version 2.7.2 --- sources | 4 ++-- virt-v2v.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 09dd863..2e52a3d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-2.7.1.tar.gz) = 11f5528a48208050fda9c64c8aa6dcfd28352e26c96f15059ef66230577e87cae79286dbe035ee5fdf3c43398cba1f94569e11ff3871b26f21e7a6265a4bfa6d -SHA512 (virt-v2v-2.7.1.tar.gz.sig) = a73bce78f116f68565e1288c130c0ea4adc4e1d87174f72fc9aeff747c541afd16404d59d12d0431d50b83a9d0dbe5ff12dddbfed97d2e1d431212a895078cad +SHA512 (virt-v2v-2.7.2.tar.gz) = 19e3277af13734462c871db7b6d09f003a326c093dcbb97da19ca575708a21f3735992a9f870cb895f12ccafa3b6ecb3337d9a5fbbe3151df6e2d801d91e89c0 +SHA512 (virt-v2v-2.7.2.tar.gz.sig) = e71a07b5f35a00e917255936743afd9feced3ab6a4ada106ed42d309feca1ef1f7da1476910f041500c28ab12eeb7eaeffe94b6df6d535fcfe6a102ef8bbfab6 diff --git a/virt-v2v.spec b/virt-v2v.spec index 641acbf..d6655ab 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -6,7 +6,7 @@ Name: virt-v2v Epoch: 1 -Version: 2.7.1 +Version: 2.7.2 Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM @@ -310,6 +310,9 @@ done %changelog +* Mon Nov 18 2024 Richard W.M. Jones - 1:2.7.2-1 +- New upstream development version 2.7.2 + * Tue Oct 22 2024 Richard W.M. Jones - 1:2.7.1-1 - New upstream development version 2.7.1 - Replace jansson with json-c From 36d6e0b700a1ab296b65934c42646e81be3fbf3b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 2 Dec 2024 18:35:02 +0000 Subject: [PATCH 42/93] New upstream development version 2.7.3 New upstream development version 2.7.3 New upstream development version 2.7.3 New upstream development version 2.7.3 --- sources | 4 ++-- virt-v2v.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 2e52a3d..60712b5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-2.7.2.tar.gz) = 19e3277af13734462c871db7b6d09f003a326c093dcbb97da19ca575708a21f3735992a9f870cb895f12ccafa3b6ecb3337d9a5fbbe3151df6e2d801d91e89c0 -SHA512 (virt-v2v-2.7.2.tar.gz.sig) = e71a07b5f35a00e917255936743afd9feced3ab6a4ada106ed42d309feca1ef1f7da1476910f041500c28ab12eeb7eaeffe94b6df6d535fcfe6a102ef8bbfab6 +SHA512 (virt-v2v-2.7.3.tar.gz) = 669717474536fe73c5ed0fdf9598da66f59ef9b3a4795eab3ce670e48027fe5b29236d8c7012921e122df9b1a21a35f98ee6cd7f92f1b64dba34f164a5ed02b3 +SHA512 (virt-v2v-2.7.3.tar.gz.sig) = b2641d21078eae317bfa14f81c830496210bc943929402235357b64938e30d3de187fe7bbee80cc08742883bbb69ee399215a1227123d91960cc9a28f153268d diff --git a/virt-v2v.spec b/virt-v2v.spec index d6655ab..fd8d1f2 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -6,7 +6,7 @@ Name: virt-v2v Epoch: 1 -Version: 2.7.2 +Version: 2.7.3 Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM @@ -310,6 +310,9 @@ done %changelog +* Mon Dec 02 2024 Richard W.M. Jones - 1:2.7.3-1 +- New upstream development version 2.7.3 + * Mon Nov 18 2024 Richard W.M. Jones - 1:2.7.2-1 - New upstream development version 2.7.2 From d0673fc50f554aff55cea09110524ed4e8b7ea51 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 9 Dec 2024 17:43:29 +0000 Subject: [PATCH 43/93] New upstream development version 2.7.4 --- sources | 4 ++-- virt-v2v.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 60712b5..c15d1c4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-2.7.3.tar.gz) = 669717474536fe73c5ed0fdf9598da66f59ef9b3a4795eab3ce670e48027fe5b29236d8c7012921e122df9b1a21a35f98ee6cd7f92f1b64dba34f164a5ed02b3 -SHA512 (virt-v2v-2.7.3.tar.gz.sig) = b2641d21078eae317bfa14f81c830496210bc943929402235357b64938e30d3de187fe7bbee80cc08742883bbb69ee399215a1227123d91960cc9a28f153268d +SHA512 (virt-v2v-2.7.4.tar.gz) = b59df1d26929ef6ed1e2599e044d3fd6e05df4c37f2854f2c567554918e0b106ffbd535be50b9bc32dbfc9d3fc5feadf157e51d394f5989449f6eb18b0a3d8dc +SHA512 (virt-v2v-2.7.4.tar.gz.sig) = a28b5c6c6ff7599bfb771ee649101745dcfff9b9e51846b7c057764565dbb5c0c80ac22e2167f875df88e466a251f760e951ee7b92672fca6b49c4d3bd8db143 diff --git a/virt-v2v.spec b/virt-v2v.spec index fd8d1f2..c217851 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -6,7 +6,7 @@ Name: virt-v2v Epoch: 1 -Version: 2.7.3 +Version: 2.7.4 Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM @@ -310,6 +310,9 @@ done %changelog +* Mon Dec 09 2024 Richard W.M. Jones - 1:2.7.4-1 +- New upstream development version 2.7.4 + * Mon Dec 02 2024 Richard W.M. Jones - 1:2.7.3-1 - New upstream development version 2.7.3 From 0c56c2baacb52f2856745037a3215debf7227fb6 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 10 Jan 2025 14:40:37 -0700 Subject: [PATCH 44/93] OCaml 5.3.0 rebuild for Fedora 42 --- virt-v2v.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index c217851..2aae3b9 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 +* Fri Jan 10 2025 Jerry James - 1:2.7.4-2 +- OCaml 5.3.0 rebuild for Fedora 42 + * Mon Dec 09 2024 Richard W.M. Jones - 1:2.7.4-1 - New upstream development version 2.7.4 From 5cf65da2df2703100ce661e235cac5e54c1b4d99 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:28:22 +0000 Subject: [PATCH 45/93] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- virt-v2v.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 2aae3b9..1838740 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: 3%{?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 +* Sun Jan 19 2025 Fedora Release Engineering - 1:2.7.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jan 10 2025 Jerry James - 1:2.7.4-2 - OCaml 5.3.0 rebuild for Fedora 42 From ec7068338036acf2760cda65ac5dc285d5c42d02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 1 Feb 2025 19:58:09 +0100 Subject: [PATCH 46/93] 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 --- virt-v2v.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 1838740..487daec 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -7,7 +7,7 @@ Name: virt-v2v Epoch: 1 Version: 2.7.4 -Release: 3%{?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 - 1:2.7.4-4 +- Add explicit BR: libxcrypt-devel + * Sun Jan 19 2025 Fedora Release Engineering - 1:2.7.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From ea0459111dcd66abd1b10153ddb67d3f0ba57cfb Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 4 Feb 2025 15:12:04 +0000 Subject: [PATCH 47/93] Bump and rebuild (RHBZ#2341511) Move to OCaml 4.08, new baseline version upstream. --- virt-v2v.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 487daec..d8f51d6 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 - 1:2.7.4-5 +- Bump and rebuild (RHBZ#2341511) + * Sat Feb 01 2025 Björn Esser - 1:2.7.4-4 - Add explicit BR: libxcrypt-devel From 938ffd31a882d343e64f13864659513b5baefa23 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 5 Feb 2025 15:26:39 +0000 Subject: [PATCH 48/93] New upstream development version 2.7.5 --- 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 d8f51d6..438610f 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 - 1:2.7.5-1 +- New upstream development version 2.7.5 + * Tue Feb 04 2025 Richard W.M. Jones - 1:2.7.4-5 - Bump and rebuild (RHBZ#2341511) From 68cc862c48dce79772a43f7ade941e0e58f4e7e7 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 13 Feb 2025 09:54:55 +0000 Subject: [PATCH 49/93] New upstream development version 2.7.6 --- 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 438610f..bc3dffa 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 - 1:2.7.6-1 +- New upstream development version 2.7.6 + * Wed Feb 05 2025 Richard W.M. Jones - 1:2.7.5-1 - New upstream development version 2.7.5 From 1765b12755ea534df67cd326766a1af00a7c4163 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 27 Feb 2025 09:37:21 +0000 Subject: [PATCH 50/93] Bump and rebuild for ocaml-gettext 0.5.0 --- virt-v2v.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index bc3dffa..fdbaab8 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -7,7 +7,7 @@ Name: virt-v2v Epoch: 1 Version: 2.7.6 -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 @@ -311,6 +311,9 @@ done %changelog +* Thu Feb 27 2025 Richard W.M. Jones - 1:2.7.6-2 +- Bump and rebuild for ocaml-gettext 0.5.0 + * Thu Feb 13 2025 Richard W.M. Jones - 1:2.7.6-1 - New upstream development version 2.7.6 From 27be67588bde942689b5ae0fa70235c5e6ef010f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 27 Feb 2025 18:24:35 +0000 Subject: [PATCH 51/93] New upstream development version 2.7.7 Disable gettext support in Fedora Rawhide --- sources | 4 ++-- virt-v2v.spec | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 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 fdbaab8..23a8cb5 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -6,8 +6,8 @@ Name: virt-v2v Epoch: 1 -Version: 2.7.6 -Release: 2%{?dist} +Version: 2.7.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 @@ -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,10 @@ done %changelog +* Thu Feb 27 2025 Richard W.M. Jones - 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 - 1:2.7.6-2 - Bump and rebuild for ocaml-gettext 0.5.0 From dba25ec5fb8761d0825a1dd47e0da8f1b28fa4db Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 11 Mar 2025 15:39:14 +0000 Subject: [PATCH 52/93] New upstream development version 2.7.8 --- 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 23a8cb5..8248270 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 - 1:2.7.8-1 +- New upstream development version 2.7.8 + * Thu Feb 27 2025 Richard W.M. Jones - 1:2.7.7-1 - New upstream development version 2.7.7 - Disable gettext support in Fedora Rawhide From bc0707eb3b37df61844865b05a2e8decb971282b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 18 Mar 2025 15:38:43 +0000 Subject: [PATCH 53/93] Fix use of rhel macro With RPM 4.14.3 from SUSE I got this error: error: line 130: Unknown tag: %elif == 9 After correcting %{?rhel} -> 0%{?rhel}, this error appeared instead: error: line 130: Unknown tag: %elif 0 == 9 --- virt-v2v.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 8248270..2f1d8a6 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -127,10 +127,12 @@ Requires: edk2-aarch64 %if !0%{?rhel} Requires: /usr/bin/python3 -%elif %{?rhel} == 9 +%else +%if 0%{?rhel} == 9 Requires: platform-python # Python is not needed by RHEL 10. %endif +%endif Requires: libnbd >= 1.10 Requires: %{_bindir}/qemu-nbd Requires: %{_bindir}/nbdcopy From fbf3a55ceb2c859ea1609c7e463929eb7a7c3826 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 22 Mar 2025 10:10:33 +0000 Subject: [PATCH 54/93] New upstream development version 2.7.9 --- 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 2f1d8a6..2433598 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 @@ -317,6 +317,9 @@ done %changelog +* Sat Mar 22 2025 Richard W.M. Jones - 1:2.7.9-1 +- New upstream development version 2.7.9 + * Tue Mar 11 2025 Richard W.M. Jones - 1:2.7.8-1 - New upstream development version 2.7.8 From f575eed3ef0a89cd575c3c9b616bed3b8a44d297 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 22 Mar 2025 11:14:34 +0000 Subject: [PATCH 55/93] 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. --- 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 2433598..817ee96 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 @@ -317,8 +317,8 @@ done %changelog -* Sat Mar 22 2025 Richard W.M. Jones - 1:2.7.9-1 -- New upstream development version 2.7.9 +* Sat Mar 22 2025 Richard W.M. Jones - 1:2.7.10-1 +- New upstream development version 2.7.10 * Tue Mar 11 2025 Richard W.M. Jones - 1:2.7.8-1 - New upstream development version 2.7.8 From 87a7e3cd66dbffc6d86f13d0313228a983375258 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 3 Apr 2025 09:47:17 +0100 Subject: [PATCH 56/93] Enable ocaml-gettext again --- virt-v2v.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 817ee96..a82065b 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 @@ -317,6 +313,9 @@ done %changelog +* Thu Apr 03 2025 Richard W.M. Jones - 1:2.7.10-2 +- Enable ocaml-gettext again + * Sat Mar 22 2025 Richard W.M. Jones - 1:2.7.10-1 - New upstream development version 2.7.10 From e94005d4aef6d2446f2a85c1abbced066ee98e65 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 3 Apr 2025 10:06:44 +0100 Subject: [PATCH 57/93] Remove oUnit --- virt-v2v.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index a82065b..ea26923 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 eef1115428363cf4d2ab5129bec30c2c8989adce Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 3 Apr 2025 12:53:44 +0100 Subject: [PATCH 58/93] New upstream development version 2.7.11 --- 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 ea26923..5e38d39 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 @@ -310,8 +310,10 @@ done %changelog -* Thu Apr 03 2025 Richard W.M. Jones - 1:2.7.10-2 +* Thu Apr 03 2025 Richard W.M. Jones - 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 - 1:2.7.10-1 - New upstream development version 2.7.10 From b9cfcbc1bd184d4622b45823bfb8346a4e0754c0 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 15 Apr 2025 17:02:45 +0100 Subject: [PATCH 59/93] New upstream development version 2.7.12 --- 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 5e38d39..ec82921 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 @@ -310,6 +310,9 @@ done %changelog +* Tue Apr 15 2025 Richard W.M. Jones - 1:2.7.12-1 +- New upstream development version 2.7.12 + * Thu Apr 03 2025 Richard W.M. Jones - 1:2.7.11-1 - New upstream development version 2.7.11 - Enable ocaml-gettext again From d82a76fce56b7cea77fa05e88f189a29a6daef11 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 29 Apr 2025 16:40:22 +0100 Subject: [PATCH 60/93] New upstream development version 2.7.13 --- 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 ec82921..67e7ef7 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 @@ -143,9 +143,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 @@ -310,6 +310,9 @@ done %changelog +* Tue Apr 29 2025 Richard W.M. Jones - 1:2.7.13-1 +- New upstream development version 2.7.13 + * Tue Apr 15 2025 Richard W.M. Jones - 1:2.7.12-1 - New upstream development version 2.7.12 From a9f381c640f661ae0426ea88df5d473897372fda Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 7 May 2025 12:32:57 +0100 Subject: [PATCH 61/93] New upstream development version 2.7.14 New tool: virt-v2v-open --- 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 67e7ef7..f040b94 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 @@ -276,6 +276,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* @@ -284,6 +285,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} @@ -310,6 +312,10 @@ done %changelog +* Wed May 07 2025 Richard W.M. Jones - 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 - 1:2.7.13-1 - New upstream development version 2.7.13 From 959a529547ea36b42c5415e4314c2d370886b581 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 12 May 2025 17:13:28 +0100 Subject: [PATCH 62/93] New upstream development version 2.7.15 --- 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 f040b94..b9a6dd1 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 @@ -312,6 +312,9 @@ done %changelog +* Mon May 12 2025 Richard W.M. Jones - 1:2.7.15-1 +- New upstream development version 2.7.15 + * Wed May 07 2025 Richard W.M. Jones - 1:2.7.14-1 - New upstream development version 2.7.14 - New tool: virt-v2v-open From 670ec36027beb4579ccf9426315dddd1609b59b6 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 12 May 2025 18:58:41 +0100 Subject: [PATCH 63/93] Rename virt-v2v-output-rhv(1) -> virt-v2v-output-ovirt(1) --- virt-v2v.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index b9a6dd1..9373baf 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -234,7 +234,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. @@ -289,7 +289,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 b04c24f962fdd2e38ab53370c43e4218190c10a4 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 19 May 2025 15:08:45 +0100 Subject: [PATCH 64/93] New upstream development version 2.7.16 --- 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 9373baf..a8fe4e7 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. @@ -312,6 +312,9 @@ done %changelog +* Mon May 19 2025 Richard W.M. Jones - 1:2.7.16-1 +- New upstream development version 2.7.16 + * Mon May 12 2025 Richard W.M. Jones - 1:2.7.15-1 - New upstream development version 2.7.15 From 5d3dce2ea50b1b91064304793269d0b5e61460b2 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 19 May 2025 16:43:07 +0100 Subject: [PATCH 65/93] Add temporary workaround for bug in gettext --- virt-v2v.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/virt-v2v.spec b/virt-v2v.spec index a8fe4e7..cd2f164 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -206,6 +206,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 0950fa2dd44fbe9bc781a310fe5f64ecf0b34d2e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 3 Jun 2025 16:34:56 +0100 Subject: [PATCH 66/93] New upstream development version 2.7.17 --- 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 cd2f164..a4b256d 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 @@ -315,6 +315,9 @@ done %changelog +* Tue Jun 03 2025 Richard W.M. Jones - 1:2.7.17-1 +- New upstream development version 2.7.17 + * Mon May 19 2025 Richard W.M. Jones - 1:2.7.16-1 - New upstream development version 2.7.16 From 689bbb8b49fe0261c4e7bd8717f8630497b3ed55 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 11 Jun 2025 14:47:45 +0100 Subject: [PATCH 67/93] New upstream stable version 2.8.0 Finetune BRs to match upstream. --- 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 a4b256d..fa206c3 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 @@ -315,6 +315,10 @@ done %changelog +* Wed Jun 11 2025 Richard W.M. Jones - 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 - 1:2.7.17-1 - New upstream development version 2.7.17 From b406c18f55bc4e608e9d0489a89ea55ca740cdd8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 26 Jun 2025 16:26:03 +0100 Subject: [PATCH 68/93] New upstream stable version 2.8.1 --- 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 fa206c3..b2742dc 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 @@ -315,6 +315,9 @@ done %changelog +* Thu Jun 26 2025 Richard W.M. Jones - 1:2.8.1-1 +- New upstream stable version 2.8.1 + * Wed Jun 11 2025 Richard W.M. Jones - 1:2.8.0-1 - New upstream stable version 2.8.0 - Finetune BRs to match upstream. From d99c2b9523d8fa1b2cbbcb2529ab7df28e20e629 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 12 Jul 2025 16:38:48 -0600 Subject: [PATCH 69/93] Rebuild to fix OCaml dependencies --- virt-v2v.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index b2742dc..b314f17 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -7,7 +7,7 @@ Name: virt-v2v Epoch: 1 Version: 2.8.1 -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 @@ -315,6 +315,9 @@ done %changelog +* Sat Jul 12 2025 Jerry James - 1:2.8.1-2 +- Rebuild to fix OCaml dependencies + * Thu Jun 26 2025 Richard W.M. Jones - 1:2.8.1-1 - New upstream stable version 2.8.1 From 5b7f91c42fa4271cf98577b8ea7724e96c489048 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 13 Jul 2025 13:03:31 +0100 Subject: [PATCH 70/93] New upstream development version 2.9.1 --- sources | 4 ++-- virt-v2v.spec | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/sources b/sources index 55ec579..9c7b034 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-2.8.1.tar.gz) = 70da68563e870955ca013e6d55be8f56ad65dde6f84909f06fae7ab928227a566e8949bb90e839fffce2ad4ebc604b2cfa1c5547394c8d1bd092bb95f9e6435c -SHA512 (virt-v2v-2.8.1.tar.gz.sig) = 1236dd21272c53dbafb4cd0ac4177bcf73600ff52ea8949b878793eafb1829a67880043c6e03c2d82c691d986ea8a7daa60508f4ae22345c961a939b3b6a43b0 +SHA512 (virt-v2v-2.9.1.tar.gz) = af44995b7bfbfd58263773600f3dcdf1ab4c221fd5a2a3137a63e12f33e8a9d017f6c11e623c8b1e268a23475222b764121fc9cb546639a508a7304305f40ea0 +SHA512 (virt-v2v-2.9.1.tar.gz.sig) = 587d6ae2933a634ee105ff50e2dbcb65105e0e417e57a1a5bae99b55380cff5ff99854eec161bcf7f2b9557529de43b83dab0cf78c57dc6a61a485c9fd23c475 diff --git a/virt-v2v.spec b/virt-v2v.spec index b314f17..52dbe65 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -2,12 +2,12 @@ %global verify_tarball_signature 1 # The source directory. -%global source_directory 2.8-stable +%global source_directory 2.9-development Name: virt-v2v Epoch: 1 -Version: 2.8.1 -Release: 2%{?dist} +Version: 2.9.1 +Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -315,6 +315,9 @@ done %changelog +* Sun Jul 13 2025 Richard W.M. Jones - 1:2.9.1-1 +- New upstream development version 2.9.1 + * Sat Jul 12 2025 Jerry James - 1:2.8.1-2 - Rebuild to fix OCaml dependencies From 69d7d754bc64df2a3c6127d754620c18db284678 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sun, 13 Jul 2025 13:00:12 -0600 Subject: [PATCH 71/93] Rebuild to fix OCaml dependencies again --- virt-v2v.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 52dbe65..02ce801 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -7,7 +7,7 @@ Name: virt-v2v Epoch: 1 Version: 2.9.1 -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 @@ -315,6 +315,9 @@ done %changelog +* Sun Jul 13 2025 Jerry James - 1:2.9.1-2 +- Rebuild to fix OCaml dependencies again + * Sun Jul 13 2025 Richard W.M. Jones - 1:2.9.1-1 - New upstream development version 2.9.1 From 10c9afdfa8009357ed1944271184773df489e7d8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 16 Jul 2025 13:37:40 +0100 Subject: [PATCH 72/93] New upstream development version 2.9.2 --- sources | 4 ++-- virt-v2v.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 9c7b034..0286d0c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-2.9.1.tar.gz) = af44995b7bfbfd58263773600f3dcdf1ab4c221fd5a2a3137a63e12f33e8a9d017f6c11e623c8b1e268a23475222b764121fc9cb546639a508a7304305f40ea0 -SHA512 (virt-v2v-2.9.1.tar.gz.sig) = 587d6ae2933a634ee105ff50e2dbcb65105e0e417e57a1a5bae99b55380cff5ff99854eec161bcf7f2b9557529de43b83dab0cf78c57dc6a61a485c9fd23c475 +SHA512 (virt-v2v-2.9.2.tar.gz) = 62e635322322ffefe17639c3eff036a96c2ba2eb7df2276b0d902138070b6b459bc71d757f4c1b2aa71869c8620bc67cb4094db6d7341c4202c24c83c3ae7b1a +SHA512 (virt-v2v-2.9.2.tar.gz.sig) = d122260fd4cf17efe08396c52e211480b34f5117e14a291673c8d4669122e4e524becd5e12afb66b8c7903a8e531f58d38ea93fa42e03a7fcf47407acab9c2fb diff --git a/virt-v2v.spec b/virt-v2v.spec index 02ce801..e3c34cf 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -6,8 +6,8 @@ Name: virt-v2v Epoch: 1 -Version: 2.9.1 -Release: 2%{?dist} +Version: 2.9.2 +Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -315,6 +315,9 @@ done %changelog +* Wed Jul 16 2025 Richard W.M. Jones - 1:2.9.2-1 +- New upstream development version 2.9.2 + * Sun Jul 13 2025 Jerry James - 1:2.9.1-2 - Rebuild to fix OCaml dependencies again From 25e2eae876a4e86c84e74c064ecced2fdc985e0c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 19 Jul 2025 17:01:43 +0100 Subject: [PATCH 73/93] Bump minimum version of nbdkit to 1.45.1, matching current Rawhide Bump minimum version of nbdcopy to 1.22, matching current Fedora 42 Bump minimum version of libguestfs to 1.56 Bump minimum version of guestfs-tools to 1.54 Also: - Remove nbdkit-noextents-filter, option removed from virt-v2v 2.9.1 - Add nbdkit-count-filter, added in nbdkit 1.45 - Drop BR nbdkit-python-plugin, as it is not needed by our test --- virt-v2v.spec | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index e3c34cf..2ac4bd1 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -7,7 +7,7 @@ Name: virt-v2v Epoch: 1 Version: 2.9.2 -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 @@ -46,13 +46,13 @@ BuildRequires: /usr/bin/pod2man BuildRequires: gcc BuildRequires: ocaml >= 4.08 -BuildRequires: libguestfs-devel >= 1:1.56.0-1 +BuildRequires: libguestfs-devel >= 1:1.56 BuildRequires: augeas-devel BuildRequires: bash-completion, bash-completion-devel BuildRequires: file BuildRequires: gettext-devel BuildRequires: json-c-devel -BuildRequires: libnbd-devel >= 1.14 +BuildRequires: libnbd-devel >= 1.22 BuildRequires: libosinfo-devel BuildRequires: libvirt-daemon-kvm BuildRequires: libvirt-devel @@ -76,12 +76,10 @@ BuildRequires: glibc-utils BuildRequires: %{_bindir}/qemu-nbd BuildRequires: %{_bindir}/nbdcopy BuildRequires: %{_bindir}/nbdinfo +BuildRequires: nbdkit-server >= 1.45.1 BuildRequires: nbdkit-file-plugin BuildRequires: nbdkit-null-plugin -%if !0%{?rhel} -BuildRequires: nbdkit-python-plugin -%endif -BuildRequires: nbdkit-cow-filter >= 1.28.3-1.el9 +BuildRequires: nbdkit-cow-filter BuildRequires: mingw-srvany-redistributable >= 1.1-6 %ifarch x86_64 BuildRequires: glibc-static @@ -91,8 +89,8 @@ BuildRequires: glibc-static BuildRequires: gnupg2 %endif -Requires: libguestfs%{?_isa} >= 1:1.55.12-1 -Requires: guestfs-tools >= 1.49.7-1 +Requires: libguestfs%{?_isa} >= 1:1.56 +Requires: guestfs-tools >= 1.54 # XFS is the default filesystem in Fedora and RHEL. Requires: libguestfs-xfs @@ -126,11 +124,11 @@ Requires: platform-python # Python is not needed by RHEL 10. %endif %endif -Requires: libnbd >= 1.10 +Requires: libnbd >= 1.22 Requires: %{_bindir}/qemu-nbd Requires: %{_bindir}/nbdcopy Requires: %{_bindir}/nbdinfo -Requires: nbdkit-server >= 1.28.3-1.el9 +Requires: nbdkit-server >= 1.45.1 Requires: nbdkit-curl-plugin Requires: nbdkit-file-plugin Requires: nbdkit-nbd-plugin @@ -143,9 +141,9 @@ Requires: nbdkit-ssh-plugin Requires: nbdkit-vddk-plugin %endif Requires: nbdkit-blocksize-filter -Requires: nbdkit-cow-filter >= 1.28.3-1.el9 +Requires: nbdkit-count-filter +Requires: nbdkit-cow-filter Requires: nbdkit-multi-conn-filter -Requires: nbdkit-noextents-filter Requires: nbdkit-rate-filter Requires: nbdkit-retry-filter @@ -315,6 +313,15 @@ done %changelog +* Sat Jul 19 2025 Richard W.M. Jones - 1:2.9.2-2 +- Bump minimum version of nbdkit to 1.45.1, matching current Rawhide +- Bump minimum version of nbdcopy to 1.22, matching current Fedora 42 +- Bump minimum version of libguestfs to 1.56 +- Bump minimum version of guestfs-tools to 1.54 +- Remove nbdkit-noextents-filter, option removed from virt-v2v 2.9.1 +- Add nbdkit-count-filter, added in nbdkit 1.45 +- Drop BR nbdkit-python-plugin, as it is not needed by our test + * Wed Jul 16 2025 Richard W.M. Jones - 1:2.9.2-1 - New upstream development version 2.9.2 From 71d5e395b29695ce42e3532016d2e03d6b1e15ba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:09:05 +0000 Subject: [PATCH 74/93] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- virt-v2v.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 2ac4bd1..63e6fff 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -7,7 +7,7 @@ Name: virt-v2v Epoch: 1 Version: 2.9.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -313,6 +313,9 @@ done %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1:2.9.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Jul 19 2025 Richard W.M. Jones - 1:2.9.2-2 - Bump minimum version of nbdkit to 1.45.1, matching current Rawhide - Bump minimum version of nbdcopy to 1.22, matching current Fedora 42 From 3a85108e5c431bfd7ce9ad2cb044e14d0ab1a892 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 15 Aug 2025 11:00:49 +0100 Subject: [PATCH 75/93] New upstream development version 2.9.3 Ensure minimum libguestfs is 1.57.1 (for guestfs_setfiles) --- sources | 4 ++-- virt-v2v.spec | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/sources b/sources index 0286d0c..e4b0acb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-2.9.2.tar.gz) = 62e635322322ffefe17639c3eff036a96c2ba2eb7df2276b0d902138070b6b459bc71d757f4c1b2aa71869c8620bc67cb4094db6d7341c4202c24c83c3ae7b1a -SHA512 (virt-v2v-2.9.2.tar.gz.sig) = d122260fd4cf17efe08396c52e211480b34f5117e14a291673c8d4669122e4e524becd5e12afb66b8c7903a8e531f58d38ea93fa42e03a7fcf47407acab9c2fb +SHA512 (virt-v2v-2.9.3.tar.gz) = 9565f850e8e88fc6248bcdd0aba6e9fa098023abe343b7dea2f1564bd2ecf2912ce7afa1faf6f2c68021617304432b1cb60ab9b6e522e4b1ae47c79abc3264f6 +SHA512 (virt-v2v-2.9.3.tar.gz.sig) = 8f2b1d65c9cace756596357e9e16560bfa6ae1de0dcdb4a5353bf964831f9dcd25c512be94fa49e4ba81ea889169f77dc63415bfe3f6925ac37067b69e628cb1 diff --git a/virt-v2v.spec b/virt-v2v.spec index 63e6fff..345a670 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -6,8 +6,8 @@ Name: virt-v2v Epoch: 1 -Version: 2.9.2 -Release: 3%{?dist} +Version: 2.9.3 +Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -46,7 +46,7 @@ BuildRequires: /usr/bin/pod2man BuildRequires: gcc BuildRequires: ocaml >= 4.08 -BuildRequires: libguestfs-devel >= 1:1.56 +BuildRequires: libguestfs-devel >= 1:1.57.1-1 BuildRequires: augeas-devel BuildRequires: bash-completion, bash-completion-devel BuildRequires: file @@ -89,7 +89,7 @@ BuildRequires: glibc-static BuildRequires: gnupg2 %endif -Requires: libguestfs%{?_isa} >= 1:1.56 +Requires: libguestfs%{?_isa} >= 1:1.57.1-1 Requires: guestfs-tools >= 1.54 # XFS is the default filesystem in Fedora and RHEL. @@ -313,6 +313,10 @@ done %changelog +* Fri Aug 15 2025 Richard W.M. Jones - 1:2.9.3-1 +- New upstream development version 2.9.3 +- Ensure minimum libguestfs is 1.57.1 (for guestfs_setfiles) + * Fri Jul 25 2025 Fedora Release Engineering - 1:2.9.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 72edbc55f8e493a089bfd5e79bdafee2480fdb9b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 27 Aug 2025 10:03:26 +0100 Subject: [PATCH 76/93] New upstream development version 2.9.4 --- sources | 4 ++-- virt-v2v.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index e4b0acb..e4dbf84 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-2.9.3.tar.gz) = 9565f850e8e88fc6248bcdd0aba6e9fa098023abe343b7dea2f1564bd2ecf2912ce7afa1faf6f2c68021617304432b1cb60ab9b6e522e4b1ae47c79abc3264f6 -SHA512 (virt-v2v-2.9.3.tar.gz.sig) = 8f2b1d65c9cace756596357e9e16560bfa6ae1de0dcdb4a5353bf964831f9dcd25c512be94fa49e4ba81ea889169f77dc63415bfe3f6925ac37067b69e628cb1 +SHA512 (virt-v2v-2.9.4.tar.gz) = eb25a103c4f4af72bb6be6cb32e9014997532b53ca3a5319abdbfa5d8187d32cd7caae3a812b5f066ddc348303a2957a926524b016e66100d6ca785dcd1d02a2 +SHA512 (virt-v2v-2.9.4.tar.gz.sig) = ed927b57b78469781275849843c1ca6d557791d83362a7f02db47eba13d2ea0345f7959e918fd8d83d4c69459312a077fcf202c6dba2f35ae4408634fee1285a diff --git a/virt-v2v.spec b/virt-v2v.spec index 345a670..dbc2260 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -6,7 +6,7 @@ Name: virt-v2v Epoch: 1 -Version: 2.9.3 +Version: 2.9.4 Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM @@ -313,6 +313,9 @@ done %changelog +* Wed Aug 27 2025 Richard W.M. Jones - 1:2.9.4-1 +- New upstream development version 2.9.4 + * Fri Aug 15 2025 Richard W.M. Jones - 1:2.9.3-1 - New upstream development version 2.9.3 - Ensure minimum libguestfs is 1.57.1 (for guestfs_setfiles) From 26965f881b5c76fc2f77c7e255d3c9579279f58d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 29 Aug 2025 10:34:15 +0100 Subject: [PATCH 77/93] New upstream development version 2.9.4 Use new ./configure --disable/--enable flags for excluding RHEL features --- sources | 4 +- virt-v2v.spec | 106 +++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 85 insertions(+), 25 deletions(-) diff --git a/sources b/sources index e4dbf84..a005b1c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-2.9.4.tar.gz) = eb25a103c4f4af72bb6be6cb32e9014997532b53ca3a5319abdbfa5d8187d32cd7caae3a812b5f066ddc348303a2957a926524b016e66100d6ca785dcd1d02a2 -SHA512 (virt-v2v-2.9.4.tar.gz.sig) = ed927b57b78469781275849843c1ca6d557791d83362a7f02db47eba13d2ea0345f7959e918fd8d83d4c69459312a077fcf202c6dba2f35ae4408634fee1285a +SHA512 (virt-v2v-2.9.5.tar.gz) = 035a9bcbae6143364bd5b0c5236520a89e1d2543e46c4fdfaba1fe0f71db09af8899e75f67669f77318340dce54bcdc4810462e97c2913ef2663f9bc0264398d +SHA512 (virt-v2v-2.9.5.tar.gz.sig) = bc7963e14432b945b688d3efc88d8df13a7a3960c949add5a4de6c128a5db9b2f769333b12e9a255e96663a932d1789de8a1253d6934610d81f376205941b3a5 diff --git a/virt-v2v.spec b/virt-v2v.spec index dbc2260..cd09cf2 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -4,9 +4,47 @@ # The source directory. %global source_directory 2.9-development +%if !0%{?rhel} +# Optional features enabled in this build for Fedora. +%global with_block_driver 1 +%global with_glance 1 +%global with_ovirt 1 +%global with_xen 1 + +# libguestfs hasn't been built on i686 for a while since there is no +# kernel built for this architecture any longer and libguestfs rather +# fundamentally depends on the kernel. Therefore we must exclude this +# arch. Note there is no bug filed for this because we do not ever +# expect that libguestfs or virt-v2v will be available on i686 so +# there is nothing that needs fixing. +ExcludeArch: %{ix86} + +# Version extra string for Fedora. +%global version_extra fedora=%{fedora},release=%{release} + +%else + +# Optional features enabled in this build for RHEL. +%global with_block_driver 0 +%global with_glance 0 +%global with_ovirt 0 +%global with_xen 0 + +# Architectures where virt-v2v is shipped on RHEL: +# +# not on aarch64 because it is not useful there +# not on %%{power64} because of RHBZ#1287826 +# not on s390x because it is not useful there +ExclusiveArch: x86_64 + +# Version extra string for RHEL. +%global version_extra rhel=%{rhel},release=%{release} + +%endif + Name: virt-v2v Epoch: 1 -Version: 2.9.4 +Version: 2.9.5 Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM @@ -23,23 +61,6 @@ Source2: libguestfs.keyring # Maintainer script which helps with handling patches. Source3: copy-patches.sh -%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 -# fundamentally depends on the kernel. Therefore we must exclude this -# arch. Note there is no bug filed for this because we do not ever -# expect that libguestfs or virt-v2v will be available on i686 so -# there is nothing that needs fixing. -ExcludeArch: %{ix86} -%else -# Architectures where virt-v2v is shipped on RHEL: -# -# not on aarch64 because it is not useful there -# not on %%{power64} because of RHBZ#1287826 -# not on s390x because it is not useful there -ExclusiveArch: x86_64 -%endif - BuildRequires: autoconf, automake, libtool BuildRequires: make BuildRequires: /usr/bin/pod2man @@ -212,11 +233,27 @@ autoreconf -fiv %build %configure \ -%if !0%{?rhel} - --with-extra="fedora=%{fedora},release=%{release}" \ +%if %{with_block_driver} + --enable-block-driver \ %else - --with-extra="rhel=%{rhel},release=%{release}" \ + --disable-block-driver \ %endif +%if %{with_glance} + --enable-glance \ +%else + --disable-glance \ +%endif +%if %{with_ovirt} + --enable-ovirt \ +%else + --disable-ovirt \ +%endif +%if %{with_xen} + --enable-xen \ +%else + --disable-xen \ +%endif + --with-extra="%{version_extra}" make V=1 %{?_smp_mflags} @@ -243,6 +280,23 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v-output-ovirt.1* %check +# Check that the binary runs and the features match those configured. +./run virt-v2v --version +./run virt-v2v --machine-readable | tee machine-readable.out +grep "virt-v2v-2.0" machine-readable.out +grep "input:disk" machine-readable.out +%if %{with_block_driver} +grep "block-driver-option" machine-readable.out +%endif +%if %{with_glance} +grep "output:glance" machine-readable.out +%endif +%if %{with_ovirt} +grep "output:ovirt$" machine-readable.out +grep "output:ovirt-upload" machine-readable.out +grep "output:vdsm" machine-readable.out +%endif + %ifarch x86_64 # Only run the tests with non-debug (ie. non-Rawhide) kernels. # XXX This tests for any debug kernel installed. @@ -281,15 +335,17 @@ done %{_mandir}/man1/virt-v2v.1* %{_mandir}/man1/virt-v2v-hacking.1* %{_mandir}/man1/virt-v2v-input-vmware.1* -%if !0%{?rhel} +%if %{with_xen} %{_mandir}/man1/virt-v2v-input-xen.1* +%endif +%if !0%{?rhel} %{_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} +%if %{with_ovirt} %{_mandir}/man1/virt-v2v-output-ovirt.1* %endif %{_mandir}/man1/virt-v2v-release-notes-1.42.1* @@ -313,6 +369,10 @@ done %changelog +* Fri Aug 29 2025 Richard W.M. Jones - 1:2.9.5-1 +- New upstream development version 2.9.4 +- Use new ./configure --disable/--enable flags for excluding RHEL features + * Wed Aug 27 2025 Richard W.M. Jones - 1:2.9.4-1 - New upstream development version 2.9.4 From 66650d837a4229eaec71ef73631d3a3b7d5b4fdd Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 29 Aug 2025 10:55:37 +0100 Subject: [PATCH 78/93] Fix version number in changelog --- virt-v2v.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index cd09cf2..f06e022 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -370,7 +370,7 @@ done %changelog * Fri Aug 29 2025 Richard W.M. Jones - 1:2.9.5-1 -- New upstream development version 2.9.4 +- New upstream development version 2.9.5 - Use new ./configure --disable/--enable flags for excluding RHEL features * Wed Aug 27 2025 Richard W.M. Jones - 1:2.9.4-1 From 520c690092220eb65c15ecbb9ebc132458b63208 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 29 Aug 2025 11:07:23 +0100 Subject: [PATCH 79/93] Add missing perl dependencies Previously some of these were pulled in implicitly. However IPC::Run3 is a new dependency of podwrapper and we need to be explicit about that one. --- virt-v2v.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/virt-v2v.spec b/virt-v2v.spec index f06e022..c937dac 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -64,6 +64,9 @@ Source3: copy-patches.sh BuildRequires: autoconf, automake, libtool BuildRequires: make BuildRequires: /usr/bin/pod2man +BuildRequires: perl(Pod::Usage) +BuildRequires: perl(Getopt::Long) +BuildRequires: perl(IPC::Run3) BuildRequires: gcc BuildRequires: ocaml >= 4.08 From 1fa63ef939c375b0d8d5b72fc2a6570d7f1a8c32 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 29 Aug 2025 13:09:22 +0100 Subject: [PATCH 80/93] Require nbdkit-python-plugin only if we built oVirt support --- virt-v2v.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index c937dac..4481f45 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -140,7 +140,7 @@ Requires: edk2-ovmf Requires: edk2-aarch64 %endif -%if !0%{?rhel} +%if !%{with_ovirt} Requires: /usr/bin/python3 %else %if 0%{?rhel} == 9 @@ -157,7 +157,7 @@ Requires: nbdkit-curl-plugin Requires: nbdkit-file-plugin Requires: nbdkit-nbd-plugin Requires: nbdkit-null-plugin -%if !0%{?rhel} +%if !%{with_ovirt} Requires: nbdkit-python-plugin %endif Requires: nbdkit-ssh-plugin From 4a4aa3a93881e4d716231fa016fc4f893bde8ee1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 29 Aug 2025 13:05:42 +0100 Subject: [PATCH 81/93] Unify Fedora and RHEL 10.2 spec files --- virt-v2v.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 4481f45..2a9018e 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -72,7 +72,10 @@ BuildRequires: ocaml >= 4.08 BuildRequires: libguestfs-devel >= 1:1.57.1-1 BuildRequires: augeas-devel -BuildRequires: bash-completion, bash-completion-devel +BuildRequires: bash-completion +%if !0%{?rhel} +BuildRequires: bash-completion-devel +%endif BuildRequires: file BuildRequires: gettext-devel BuildRequires: json-c-devel @@ -142,11 +145,6 @@ Requires: edk2-aarch64 %if !%{with_ovirt} Requires: /usr/bin/python3 -%else -%if 0%{?rhel} == 9 -Requires: platform-python -# Python is not needed by RHEL 10. -%endif %endif Requires: libnbd >= 1.22 Requires: %{_bindir}/qemu-nbd From 030036337929546c950207af6775c960eb660c91 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 1 Sep 2025 09:39:16 +0100 Subject: [PATCH 82/93] RHEL: Unnecessary to delete input-xen and output-ovirt man pages Since RHEL is compiled with_xen == 0 && with_ovirt == 0, the project should not generate these files, so deleting them should not be necessary. --- virt-v2v.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 2a9018e..6063de4 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -271,9 +271,6 @@ find $RPM_BUILD_ROOT -name '*.la' -delete 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* -# 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-ovirt.1* %endif # Find locale files. From 4a7db747882488105c4bde7aae87206091671b1e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 9 Sep 2025 21:34:06 +0100 Subject: [PATCH 83/93] New upstream development version 2.9.6 --- sources | 4 ++-- virt-v2v.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index a005b1c..f972117 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-2.9.5.tar.gz) = 035a9bcbae6143364bd5b0c5236520a89e1d2543e46c4fdfaba1fe0f71db09af8899e75f67669f77318340dce54bcdc4810462e97c2913ef2663f9bc0264398d -SHA512 (virt-v2v-2.9.5.tar.gz.sig) = bc7963e14432b945b688d3efc88d8df13a7a3960c949add5a4de6c128a5db9b2f769333b12e9a255e96663a932d1789de8a1253d6934610d81f376205941b3a5 +SHA512 (virt-v2v-2.9.6.tar.gz) = 983c784d5190c0590f83357dea1ccb2c1f9a528a26f39122b24ef35dd0209151e89acb749f11cb0d7201d33ada31330f858becc049d11790229cadcaa306bcc4 +SHA512 (virt-v2v-2.9.6.tar.gz.sig) = 28199a3d7d38148b16033831c5b26f3e5013d47d769dbd7e5571deb64e4bf094e31c8df62f5c55a0bae621b19a5011b209917d671e7c34531e6b95d304d88aaf diff --git a/virt-v2v.spec b/virt-v2v.spec index 6063de4..83d26a8 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -44,7 +44,7 @@ ExclusiveArch: x86_64 Name: virt-v2v Epoch: 1 -Version: 2.9.5 +Version: 2.9.6 Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM @@ -367,6 +367,9 @@ done %changelog +* Tue Sep 9 2025 Richard W.M. Jones - 1:2.9.6-1 +- New upstream development version 2.9.6 + * Fri Aug 29 2025 Richard W.M. Jones - 1:2.9.5-1 - New upstream development version 2.9.5 - Use new ./configure --disable/--enable flags for excluding RHEL features From 792368a646919e24c8adb0e1a24e804dd6214371 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 20 Sep 2025 17:25:20 +0100 Subject: [PATCH 84/93] New upstream development version 2.9.7 Ignore non-upstream patch to improve Windows conversions --- 0001-Update-common-submodule.patch | 48 ++++++++++++++++++++++++++++++ sources | 4 +-- virt-v2v.spec | 10 ++++++- 3 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 0001-Update-common-submodule.patch diff --git a/0001-Update-common-submodule.patch b/0001-Update-common-submodule.patch new file mode 100644 index 0000000..a9cbd58 --- /dev/null +++ b/0001-Update-common-submodule.patch @@ -0,0 +1,48 @@ +From 6e15298cb5e7438ecda8fd5c08f2a5ec868e97a7 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Sat, 20 Sep 2025 17:20:25 +0100 +Subject: [PATCH] Update common submodule + + Richard W.M. Jones (2): + daemon, generator: Use power of 2 for initial size of Hashtbl.create + mlcustomize/inject_virtio_win.ml: Use viostor.inf instead of guestor +--- + common | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Submodule common 5be8d55214..ebcd4d5ecc: +diff --git a/common/mlcustomize/customize_run.ml b/common/mlcustomize/customize_run.ml +index ff719f4..64afd3a 100644 +--- a/common/mlcustomize/customize_run.ml ++++ b/common/mlcustomize/customize_run.ml +@@ -97,7 +97,7 @@ let run (g : G.guestfs) root (ops : ops) = + ) in + + (* Store the passwords and set them all at the end. *) +- let passwords = Hashtbl.create 13 in ++ let passwords = Hashtbl.create 16 in + let set_password user pw = + if Hashtbl.mem passwords user then + error (f_"multiple --root-password/--password options set the \ +diff --git a/common/mlcustomize/inject_virtio_win.ml b/common/mlcustomize/inject_virtio_win.ml +index b26b14d..114df06 100644 +--- a/common/mlcustomize/inject_virtio_win.ml ++++ b/common/mlcustomize/inject_virtio_win.ml +@@ -310,8 +310,13 @@ and ddb_regedits inspect drv_name drv_pciid = + * one must add keys into the DriverDatabase. + *) + ++ let winarch = ++ match inspect.i_arch with ++ | "i386" -> "x86" | "x86_64" -> "amd64" ++ | _ -> assert false in ++ + let drv_inf = "guestor.inf" in +- let drv_inf_label = drv_inf ^ "_tmp" in ++ let drv_inf_label = sprintf "%s_%s_0000000000000000" drv_inf winarch in + let drv_config = "guestor_conf" in + + [ +-- +2.50.1 + diff --git a/sources b/sources index f972117..d9ef2db 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-2.9.6.tar.gz) = 983c784d5190c0590f83357dea1ccb2c1f9a528a26f39122b24ef35dd0209151e89acb749f11cb0d7201d33ada31330f858becc049d11790229cadcaa306bcc4 -SHA512 (virt-v2v-2.9.6.tar.gz.sig) = 28199a3d7d38148b16033831c5b26f3e5013d47d769dbd7e5571deb64e4bf094e31c8df62f5c55a0bae621b19a5011b209917d671e7c34531e6b95d304d88aaf +SHA512 (virt-v2v-2.9.7.tar.gz) = 55e517ec9b5a5850b1bf5f4ac14df307e1ffa0fb8b3f836c05964a091a204de7f9931ca7572618ba6e9f5902c7e4f524de76c3e4c725a302d0007d2fb4a26326 +SHA512 (virt-v2v-2.9.7.tar.gz.sig) = 0a7b49b809a6c08c7722d4d1029aecf6cf170b8bdf5e8e4bef37c401fa0212d2770760cfc4c77169d34d6f473a9f367eeedb9406005c7e0bf9d77c5034c8477b diff --git a/virt-v2v.spec b/virt-v2v.spec index 83d26a8..3eaebc5 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -44,7 +44,7 @@ ExclusiveArch: x86_64 Name: virt-v2v Epoch: 1 -Version: 2.9.6 +Version: 2.9.7 Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM @@ -61,6 +61,10 @@ Source2: libguestfs.keyring # Maintainer script which helps with handling patches. Source3: copy-patches.sh +# Improve Windows conversions. Not upstream yet. +# https://github.com/libguestfs/libguestfs-common/pull/17 +Patch: 0001-Update-common-submodule.patch + BuildRequires: autoconf, automake, libtool BuildRequires: make BuildRequires: /usr/bin/pod2man @@ -367,6 +371,10 @@ done %changelog +* Sat Sep 20 2025 Richard W.M. Jones - 1:2.9.7-1 +- New upstream development version 2.9.7 +- Ignore non-upstream patch to improve Windows conversions + * Tue Sep 9 2025 Richard W.M. Jones - 1:2.9.6-1 - New upstream development version 2.9.6 From 9ba178aca41062fe1e9f0e85775399723cefb6f4 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 20 Sep 2025 18:07:17 +0100 Subject: [PATCH 85/93] Fix changelog of previous commit --- virt-v2v.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 3eaebc5..fb693b7 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -373,7 +373,7 @@ done %changelog * Sat Sep 20 2025 Richard W.M. Jones - 1:2.9.7-1 - New upstream development version 2.9.7 -- Ignore non-upstream patch to improve Windows conversions +- Backport non-upstream patch to improve Windows conversions * Tue Sep 9 2025 Richard W.M. Jones - 1:2.9.6-1 - New upstream development version 2.9.6 From f5b4a662695021d26418b3bb26aaff2850f699e9 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 22 Sep 2025 15:47:18 +0100 Subject: [PATCH 86/93] New upstream development version 2.9.8 Remove Windows conversion patch which is now upstream. --- 0001-Update-common-submodule.patch | 48 ------------------------------ sources | 4 +-- virt-v2v.spec | 10 +++---- 3 files changed, 7 insertions(+), 55 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 a9cbd58..0000000 --- a/0001-Update-common-submodule.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 6e15298cb5e7438ecda8fd5c08f2a5ec868e97a7 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Sat, 20 Sep 2025 17:20:25 +0100 -Subject: [PATCH] Update common submodule - - Richard W.M. Jones (2): - daemon, generator: Use power of 2 for initial size of Hashtbl.create - mlcustomize/inject_virtio_win.ml: Use viostor.inf instead of guestor ---- - common | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Submodule common 5be8d55214..ebcd4d5ecc: -diff --git a/common/mlcustomize/customize_run.ml b/common/mlcustomize/customize_run.ml -index ff719f4..64afd3a 100644 ---- a/common/mlcustomize/customize_run.ml -+++ b/common/mlcustomize/customize_run.ml -@@ -97,7 +97,7 @@ let run (g : G.guestfs) root (ops : ops) = - ) in - - (* Store the passwords and set them all at the end. *) -- let passwords = Hashtbl.create 13 in -+ let passwords = Hashtbl.create 16 in - let set_password user pw = - if Hashtbl.mem passwords user then - error (f_"multiple --root-password/--password options set the \ -diff --git a/common/mlcustomize/inject_virtio_win.ml b/common/mlcustomize/inject_virtio_win.ml -index b26b14d..114df06 100644 ---- a/common/mlcustomize/inject_virtio_win.ml -+++ b/common/mlcustomize/inject_virtio_win.ml -@@ -310,8 +310,13 @@ and ddb_regedits inspect drv_name drv_pciid = - * one must add keys into the DriverDatabase. - *) - -+ let winarch = -+ match inspect.i_arch with -+ | "i386" -> "x86" | "x86_64" -> "amd64" -+ | _ -> assert false in -+ - let drv_inf = "guestor.inf" in -- let drv_inf_label = drv_inf ^ "_tmp" in -+ let drv_inf_label = sprintf "%s_%s_0000000000000000" drv_inf winarch in - let drv_config = "guestor_conf" in - - [ --- -2.50.1 - diff --git a/sources b/sources index d9ef2db..5a8739c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-2.9.7.tar.gz) = 55e517ec9b5a5850b1bf5f4ac14df307e1ffa0fb8b3f836c05964a091a204de7f9931ca7572618ba6e9f5902c7e4f524de76c3e4c725a302d0007d2fb4a26326 -SHA512 (virt-v2v-2.9.7.tar.gz.sig) = 0a7b49b809a6c08c7722d4d1029aecf6cf170b8bdf5e8e4bef37c401fa0212d2770760cfc4c77169d34d6f473a9f367eeedb9406005c7e0bf9d77c5034c8477b +SHA512 (virt-v2v-2.9.8.tar.gz) = b8f07f8fe451375aa6500861566c6d80dbcc38226ce8319444838087c433759274577303355b9445bfc09e9dcd51b809c599232f0f7ddb49fb33fbf8210f1031 +SHA512 (virt-v2v-2.9.8.tar.gz.sig) = 974568808749d78ad9120f262722feffec1aabec7817473fc63565750dfdf9d9eda96ef3cc6ab8de2f1490fba7a2e296b0e6ef908abff0384df24ec4f4bada15 diff --git a/virt-v2v.spec b/virt-v2v.spec index fb693b7..68416e2 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -44,7 +44,7 @@ ExclusiveArch: x86_64 Name: virt-v2v Epoch: 1 -Version: 2.9.7 +Version: 2.9.8 Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM @@ -61,10 +61,6 @@ Source2: libguestfs.keyring # Maintainer script which helps with handling patches. Source3: copy-patches.sh -# Improve Windows conversions. Not upstream yet. -# https://github.com/libguestfs/libguestfs-common/pull/17 -Patch: 0001-Update-common-submodule.patch - BuildRequires: autoconf, automake, libtool BuildRequires: make BuildRequires: /usr/bin/pod2man @@ -371,6 +367,10 @@ done %changelog +* Mon Sep 22 2025 Richard W.M. Jones - 1:2.9.8-1 +- New upstream development version 2.9.8 +- Remove Windows conversion patch which is now upstream. + * Sat Sep 20 2025 Richard W.M. Jones - 1:2.9.7-1 - New upstream development version 2.9.7 - Backport non-upstream patch to improve Windows conversions From 790400f357e36761367678decd53f01be94d1479 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 25 Sep 2025 10:54:37 -0400 Subject: [PATCH 87/93] Fix bash-completion conditional ELN (the future RHEL 11) tracks rawhide and therefore also has bash-completion-devel and the %bash_completions_dir macro. --- virt-v2v.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 68416e2..060016d 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -73,7 +73,7 @@ BuildRequires: ocaml >= 4.08 BuildRequires: libguestfs-devel >= 1:1.57.1-1 BuildRequires: augeas-devel BuildRequires: bash-completion -%if !0%{?rhel} +%if 0%{?fedora} || 0%{?rhel} >= 11 BuildRequires: bash-completion-devel %endif BuildRequires: file From a0f001aa68f950fd6596934dbc01970c0505962e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 14 Oct 2025 09:21:09 +0100 Subject: [PATCH 88/93] OCaml 5.4.0 rebuild --- virt-v2v.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 060016d..3c0f719 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -45,7 +45,7 @@ ExclusiveArch: x86_64 Name: virt-v2v Epoch: 1 Version: 2.9.8 -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 @@ -367,6 +367,9 @@ done %changelog +* Tue Oct 14 2025 Richard W.M. Jones - 1:2.9.8-2 +- OCaml 5.4.0 rebuild + * Mon Sep 22 2025 Richard W.M. Jones - 1:2.9.8-1 - New upstream development version 2.9.8 - Remove Windows conversion patch which is now upstream. From 5af6be536a9658b15273f62c033f93b0f0bbb62c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 16 Oct 2025 17:50:24 +0100 Subject: [PATCH 89/93] New upstream development version 2.9.9 --- sources | 4 ++-- virt-v2v.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 5a8739c..19e488a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-2.9.8.tar.gz) = b8f07f8fe451375aa6500861566c6d80dbcc38226ce8319444838087c433759274577303355b9445bfc09e9dcd51b809c599232f0f7ddb49fb33fbf8210f1031 -SHA512 (virt-v2v-2.9.8.tar.gz.sig) = 974568808749d78ad9120f262722feffec1aabec7817473fc63565750dfdf9d9eda96ef3cc6ab8de2f1490fba7a2e296b0e6ef908abff0384df24ec4f4bada15 +SHA512 (virt-v2v-2.9.9.tar.gz) = 82a73de492bc3565ad09cd9981d63459482872b4d3ebf376a15d8681698ae4caeb181ca4a84e0cd68b852b886346009f5350a268761f7ca7db9ac589af92938c +SHA512 (virt-v2v-2.9.9.tar.gz.sig) = dbd8b9702baa1b69f69c3aff52d95e6c2a0a1ef8f066248f3e33990ffefe429409b80001041389692dd24faf8628557d79173cc098e3fce1c5890feb27229bc5 diff --git a/virt-v2v.spec b/virt-v2v.spec index 3c0f719..165bd9c 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -44,8 +44,8 @@ ExclusiveArch: x86_64 Name: virt-v2v Epoch: 1 -Version: 2.9.8 -Release: 2%{?dist} +Version: 2.9.9 +Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -367,6 +367,9 @@ done %changelog +* Thu Oct 16 2025 Richard W.M. Jones - 1:2.9.9-1 +- New upstream development version 2.9.9 + * Tue Oct 14 2025 Richard W.M. Jones - 1:2.9.8-2 - OCaml 5.4.0 rebuild From 7ba7c6543851970522074c426acaa5324dd1332d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 20 Oct 2025 15:06:42 +0100 Subject: [PATCH 90/93] Bump minimum nbdkit version to 1.45.11 This will be the new minimum in the next development version of virt-v2v. --- virt-v2v.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 165bd9c..388d5f9 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -103,7 +103,7 @@ BuildRequires: glibc-utils BuildRequires: %{_bindir}/qemu-nbd BuildRequires: %{_bindir}/nbdcopy BuildRequires: %{_bindir}/nbdinfo -BuildRequires: nbdkit-server >= 1.45.1 +BuildRequires: nbdkit-server >= 1.45.11 BuildRequires: nbdkit-file-plugin BuildRequires: nbdkit-null-plugin BuildRequires: nbdkit-cow-filter @@ -150,7 +150,7 @@ Requires: libnbd >= 1.22 Requires: %{_bindir}/qemu-nbd Requires: %{_bindir}/nbdcopy Requires: %{_bindir}/nbdinfo -Requires: nbdkit-server >= 1.45.1 +Requires: nbdkit-server >= 1.45.11 Requires: nbdkit-curl-plugin Requires: nbdkit-file-plugin Requires: nbdkit-nbd-plugin From b07fed3631cf8afde580707c80034f1ca20dc8e1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 4 Nov 2025 16:37:14 +0000 Subject: [PATCH 91/93] New upstream development version 2.9.10 Requires libguestfs 1.57.6 for new inspection APIs. --- sources | 4 ++-- virt-v2v.spec | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sources b/sources index 19e488a..b452ce6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-2.9.9.tar.gz) = 82a73de492bc3565ad09cd9981d63459482872b4d3ebf376a15d8681698ae4caeb181ca4a84e0cd68b852b886346009f5350a268761f7ca7db9ac589af92938c -SHA512 (virt-v2v-2.9.9.tar.gz.sig) = dbd8b9702baa1b69f69c3aff52d95e6c2a0a1ef8f066248f3e33990ffefe429409b80001041389692dd24faf8628557d79173cc098e3fce1c5890feb27229bc5 +SHA512 (virt-v2v-2.9.10.tar.gz) = 950b5320413de5b398785ce98645833a770acd68ad289c86a6ea2dbe019a40c4642063cba0f6d4e7988d4521b045feb83dd7551f0ebfdba6d964757473cafcb3 +SHA512 (virt-v2v-2.9.10.tar.gz.sig) = 467a105c9469ca67c3254155682a87021610a057bc8124e1644d522bf540a944234a7118751a4f1c1308ec5bbd91904445a0223443607426f7decae2dd40c65f diff --git a/virt-v2v.spec b/virt-v2v.spec index 388d5f9..6d17d45 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -44,7 +44,7 @@ ExclusiveArch: x86_64 Name: virt-v2v Epoch: 1 -Version: 2.9.9 +Version: 2.9.10 Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM @@ -70,7 +70,7 @@ BuildRequires: perl(IPC::Run3) BuildRequires: gcc BuildRequires: ocaml >= 4.08 -BuildRequires: libguestfs-devel >= 1:1.57.1-1 +BuildRequires: libguestfs-devel >= 1:1.57.6-1 BuildRequires: augeas-devel BuildRequires: bash-completion %if 0%{?fedora} || 0%{?rhel} >= 11 @@ -116,7 +116,7 @@ BuildRequires: glibc-static BuildRequires: gnupg2 %endif -Requires: libguestfs%{?_isa} >= 1:1.57.1-1 +Requires: libguestfs%{?_isa} >= 1:1.57.6-1 Requires: guestfs-tools >= 1.54 # XFS is the default filesystem in Fedora and RHEL. @@ -367,6 +367,10 @@ done %changelog +* Tue Nov 4 2025 Richard W.M. Jones - 1:2.9.10-1 +- New upstream development version 2.9.10 +- Requires libguestfs 1.57.6 for new inspection APIs. + * Thu Oct 16 2025 Richard W.M. Jones - 1:2.9.9-1 - New upstream development version 2.9.9 From 1a5178ef0ccbf93ca30775013885db83f8e47c63 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 6 Jan 2026 11:01:45 +0000 Subject: [PATCH 92/93] New upstream stable branch version 2.10.0 Requires libguestfs >= 1.58.0 and nbdkit >= 1.46. --- sources | 4 ++-- virt-v2v.spec | 16 ++++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/sources b/sources index b452ce6..8fc8fc9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-2.9.10.tar.gz) = 950b5320413de5b398785ce98645833a770acd68ad289c86a6ea2dbe019a40c4642063cba0f6d4e7988d4521b045feb83dd7551f0ebfdba6d964757473cafcb3 -SHA512 (virt-v2v-2.9.10.tar.gz.sig) = 467a105c9469ca67c3254155682a87021610a057bc8124e1644d522bf540a944234a7118751a4f1c1308ec5bbd91904445a0223443607426f7decae2dd40c65f +SHA512 (virt-v2v-2.10.0.tar.gz) = 035f2181c1cc5f482e96d3e21b513b95939ca224d71ac6ad938842d5af5d60ef07db1600d2ccb609dc2042b1c74088f6f39ffbe595cb51e80278ecb50c314515 +SHA512 (virt-v2v-2.10.0.tar.gz.sig) = cb6301224ef00577a9cd0fc8fa504e583eb447341bd3849e6854f2d78ae72ca39bca68b70f30efd3d1d64480acf161c5e4bc9ba943595ef4dd2a654c3268aa66 diff --git a/virt-v2v.spec b/virt-v2v.spec index 6d17d45..7557908 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -2,7 +2,7 @@ %global verify_tarball_signature 1 # The source directory. -%global source_directory 2.9-development +%global source_directory 2.10-stable %if !0%{?rhel} # Optional features enabled in this build for Fedora. @@ -44,7 +44,7 @@ ExclusiveArch: x86_64 Name: virt-v2v Epoch: 1 -Version: 2.9.10 +Version: 2.10.0 Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM @@ -70,7 +70,7 @@ BuildRequires: perl(IPC::Run3) BuildRequires: gcc BuildRequires: ocaml >= 4.08 -BuildRequires: libguestfs-devel >= 1:1.57.6-1 +BuildRequires: libguestfs-devel >= 1:1.58.0-1 BuildRequires: augeas-devel BuildRequires: bash-completion %if 0%{?fedora} || 0%{?rhel} >= 11 @@ -103,7 +103,7 @@ BuildRequires: glibc-utils BuildRequires: %{_bindir}/qemu-nbd BuildRequires: %{_bindir}/nbdcopy BuildRequires: %{_bindir}/nbdinfo -BuildRequires: nbdkit-server >= 1.45.11 +BuildRequires: nbdkit-server >= 1.46.1 BuildRequires: nbdkit-file-plugin BuildRequires: nbdkit-null-plugin BuildRequires: nbdkit-cow-filter @@ -116,7 +116,7 @@ BuildRequires: glibc-static BuildRequires: gnupg2 %endif -Requires: libguestfs%{?_isa} >= 1:1.57.6-1 +Requires: libguestfs%{?_isa} >= 1:1.58.0-1 Requires: guestfs-tools >= 1.54 # XFS is the default filesystem in Fedora and RHEL. @@ -150,7 +150,7 @@ Requires: libnbd >= 1.22 Requires: %{_bindir}/qemu-nbd Requires: %{_bindir}/nbdcopy Requires: %{_bindir}/nbdinfo -Requires: nbdkit-server >= 1.45.11 +Requires: nbdkit-server >= 1.46.1 Requires: nbdkit-curl-plugin Requires: nbdkit-file-plugin Requires: nbdkit-nbd-plugin @@ -367,6 +367,10 @@ done %changelog +* Tue Jan 06 2026 Richard W.M. Jones - 1:2.10.0-1 +- New upstream stable branch version 2.10.0 +- Requires libguestfs >= 1.58.0 and nbdkit >= 1.46. + * Tue Nov 4 2025 Richard W.M. Jones - 1:2.9.10-1 - New upstream development version 2.9.10 - Requires libguestfs 1.57.6 for new inspection APIs. From daaa263ad1b2d452da262945e0033122daeb247d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 13 Jan 2026 10:50:17 +0000 Subject: [PATCH 93/93] Hard depend on libnbd >= 1.24 This is not actually necessary for Fedora. But for RHEL 10.2, where we partially backported some 1.24 APIs to libnbd 1.22, the libnbd 1.22 package now provides LIBNBD_1.24 versioned symbols. However not all of them, so for example virt-v2v can fail with: virt-v2v: symbol lookup error: virt-v2v: undefined symbol: nbd_get_handle_size, version LIBNBD_1.24 Practically this means that you can update virt-v2v to RHEL 10.2, but leave libnbd from RHEL 10.1, and virt-v2v will then fail to run. Adding a hard dependency avoids this problem, and is fine for Fedora too. Related: https://issues.redhat.com/browse/RHEL-140894 --- virt-v2v.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 7557908..9309b31 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -79,7 +79,7 @@ BuildRequires: bash-completion-devel BuildRequires: file BuildRequires: gettext-devel BuildRequires: json-c-devel -BuildRequires: libnbd-devel >= 1.22 +BuildRequires: libnbd-devel >= 1.24 BuildRequires: libosinfo-devel BuildRequires: libvirt-daemon-kvm BuildRequires: libvirt-devel @@ -146,7 +146,7 @@ Requires: edk2-aarch64 %if !%{with_ovirt} Requires: /usr/bin/python3 %endif -Requires: libnbd >= 1.22 +Requires: libnbd >= 1.24 Requires: %{_bindir}/qemu-nbd Requires: %{_bindir}/nbdcopy Requires: %{_bindir}/nbdinfo