New upstream stable version 2.6.0

(cherry picked from commit a53ed8e5fc)

sources

@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.10.0.tar.gz) = 035f2181c1cc5f482e96d3e21b513b95939ca224d71ac6ad938842d5af5d60ef07db1600d2ccb609dc2042b1c74088f6f39ffbe595cb51e80278ecb50c314515
-SHA512 (virt-v2v-2.10.0.tar.gz.sig) = cb6301224ef00577a9cd0fc8fa504e583eb447341bd3849e6854f2d78ae72ca39bca68b70f30efd3d1d64480acf161c5e4bc9ba943595ef4dd2a654c3268aa66
+SHA512 (virt-v2v-2.6.0.tar.gz) = bc7ecf99e66bae057eaf5d7c82ca38ded4aa6ef8732544bc7079f2894c9c79542a415fede02cf8c2cb7e83756683457c705f816b1da57e5ca9565350b9376a73
+SHA512 (virt-v2v-2.6.0.tar.gz.sig) = 630166caf41d48ac2efca646611248263e58a4e7e644a7606b647911164a39a449ae3916d05248d48e80925f3f9179b1cfb850001b0f3dd30a48c301d62b11a0

tests/basic-test.sh

@@ -7,7 +7,7 @@ set -x
 # team using a mix of automated and manual testing.
 
 # Fix libvirt.
-systemctl restart virtqemud virtsecretd virtstoraged virtnetworkd
+systemctl restart libvirtd
 
 virt-builder fedora-30
 virt-v2v -i disk fedora-30.img -o null

virt-v2v.spec

@@ -2,49 +2,11 @@
 %global verify_tarball_signature 1
 
 # The source directory.
-%global source_directory 2.10-stable
-
-%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
+%global source_directory 2.6-stable
 
 Name:          virt-v2v
 Epoch:         1
-Version:       2.10.0
+Version:       2.6.0
 Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
@@ -61,29 +23,39 @@ 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
-BuildRequires: perl(Pod::Usage)
-BuildRequires: perl(Getopt::Long)
-BuildRequires: perl(IPC::Run3)
 BuildRequires: gcc
-BuildRequires: ocaml >= 4.08
+BuildRequires: ocaml >= 4.04
 
-BuildRequires: libguestfs-devel >= 1:1.58.0-1
+BuildRequires: libguestfs-devel >= 1:1.49.8-1
 BuildRequires: augeas-devel
 BuildRequires: bash-completion
-%if 0%{?fedora} || 0%{?rhel} >= 11
-BuildRequires: bash-completion-devel
-%endif
-BuildRequires: file
+BuildRequires: file-devel
 BuildRequires: gettext-devel
-BuildRequires: json-c-devel
-BuildRequires: libnbd-devel >= 1.24
+BuildRequires: jansson-devel
+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)
@@ -97,16 +69,19 @@ 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
 BuildRequires: %{_bindir}/qemu-nbd
 BuildRequires: %{_bindir}/nbdcopy
 BuildRequires: %{_bindir}/nbdinfo
-BuildRequires: nbdkit-server >= 1.46.1
 BuildRequires: nbdkit-file-plugin
 BuildRequires: nbdkit-null-plugin
-BuildRequires: nbdkit-cow-filter
+BuildRequires: nbdkit-python-plugin
+BuildRequires: nbdkit-cow-filter >= 1.28.3-1.el9
 BuildRequires: mingw-srvany-redistributable >= 1.1-6
 %ifarch x86_64
 BuildRequires: glibc-static
@@ -116,8 +91,8 @@ BuildRequires: glibc-static
 BuildRequires: gnupg2
 %endif
 
-Requires:      libguestfs%{?_isa} >= 1:1.58.0-1
-Requires:      guestfs-tools >= 1.54
+Requires:      libguestfs%{?_isa} >= 1:1.49.8-1
+Requires:      guestfs-tools >= 1.49.7-1
 
 # XFS is the default filesystem in Fedora and RHEL.
 Requires:      libguestfs-xfs
@@ -143,28 +118,28 @@ Requires:      edk2-ovmf
 Requires:      edk2-aarch64
 %endif
 
-%if !%{with_ovirt}
-Requires:      /usr/bin/python3
+%if 0%{?rhel} != 8
+Requires:      python3
+%else
+Requires:      platform-python
 %endif
-Requires:      libnbd >= 1.24
+Requires:      libnbd >= 1.10
 Requires:      %{_bindir}/qemu-nbd
 Requires:      %{_bindir}/nbdcopy
 Requires:      %{_bindir}/nbdinfo
-Requires:      nbdkit-server >= 1.46.1
+Requires:      nbdkit-server >= 1.28.3-1.el9
 Requires:      nbdkit-curl-plugin
 Requires:      nbdkit-file-plugin
 Requires:      nbdkit-nbd-plugin
 Requires:      nbdkit-null-plugin
-%if !%{with_ovirt}
 Requires:      nbdkit-python-plugin
-%endif
 Requires:      nbdkit-ssh-plugin
 %ifarch x86_64
 Requires:      nbdkit-vddk-plugin
 %endif
 Requires:      nbdkit-blocksize-filter
-Requires:      nbdkit-count-filter
-Requires:      nbdkit-cow-filter
+Requires:      nbdkit-cacheextents-filter
+Requires:      nbdkit-cow-filter >= 1.28.3-1.el9
 Requires:      nbdkit-multi-conn-filter
 Requires:      nbdkit-rate-filter
 Requires:      nbdkit-retry-filter
@@ -226,35 +201,16 @@ 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
 
 
 %build
 %configure \
-%if %{with_block_driver}
-  --enable-block-driver \
+%if !0%{?rhel}
+  --with-extra="fedora=%{fedora},release=%{release}" \
 %else
-  --disable-block-driver \
+  --with-extra="rhel=%{rhel},release=%{release}" \
 %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}
 
@@ -278,23 +234,6 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v-in-place.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.
@@ -329,22 +268,18 @@ 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*
-%if %{with_xen}
-%{_mandir}/man1/virt-v2v-input-xen.1*
-%endif
 %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-open.1*
 %{_mandir}/man1/virt-v2v-output-local.1*
 %{_mandir}/man1/virt-v2v-output-openstack.1*
-%if %{with_ovirt}
-%{_mandir}/man1/virt-v2v-output-ovirt.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.*.1*
@@ -367,145 +302,6 @@ done
 
 
 %changelog
-* Tue Jan 06 2026 Richard W.M. Jones <rjones@redhat.com> - 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 <rjones@redhat.com> - 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 <rjones@redhat.com> - 1:2.9.9-1
-- New upstream development version 2.9.9
-
-* Tue Oct 14 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.9.8-2
-- OCaml 5.4.0 rebuild
-
-* Mon Sep 22 2025 Richard W.M. Jones <rjones@redhat.com> - 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 <rjones@redhat.com> - 1:2.9.7-1
-- New upstream development version 2.9.7
-- Backport non-upstream patch to improve Windows conversions
-
-* Tue Sep  9 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.9.6-1
-- New upstream development version 2.9.6
-
-* Fri Aug 29 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.9.5-1
-- 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 <rjones@redhat.com> - 1:2.9.4-1
-- New upstream development version 2.9.4
-
-* Fri Aug 15 2025 Richard W.M. Jones <rjones@redhat.com> - 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 <releng@fedoraproject.org> - 1:2.9.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sat Jul 19 2025 Richard W.M. Jones <rjones@redhat.com> - 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 <rjones@redhat.com> - 1:2.9.2-1
-- New upstream development version 2.9.2
-
-* Sun Jul 13 2025 Jerry James <loganjerry@gmail.com> - 1:2.9.1-2
-- Rebuild to fix OCaml dependencies again
-
-* Sun Jul 13 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.9.1-1
-- New upstream development version 2.9.1
-
-* Sat Jul 12 2025 Jerry James <loganjerry@gmail.com> - 1:2.8.1-2
-- Rebuild to fix OCaml dependencies
-
-* Thu Jun 26 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.8.1-1
-- New upstream stable version 2.8.1
-
-* Wed Jun 11 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.8.0-1
-- New upstream stable version 2.8.0
-- Finetune BRs to match upstream.
-
-* Tue Jun 03 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.17-1
-- New upstream development version 2.7.17
-
-* Mon May 19 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.16-1
-- New upstream development version 2.7.16
-
-* Mon May 12 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.15-1
-- New upstream development version 2.7.15
-
-* Wed May 07 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.14-1
-- New upstream development version 2.7.14
-- New tool: virt-v2v-open
-
-* Tue Apr 29 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.13-1
-- New upstream development version 2.7.13
-
-* Tue Apr 15 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.12-1
-- New upstream development version 2.7.12
-
-* Thu Apr 03 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.11-1
-- New upstream development version 2.7.11
-- Enable ocaml-gettext again
-- Remove oUnit
-
-* Sat Mar 22 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.10-1
-- New upstream development version 2.7.10
-
-* Tue Mar 11 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.8-1
-- New upstream development version 2.7.8
-
-* Thu Feb 27 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.7-1
-- New upstream development version 2.7.7
-- Disable gettext support in Fedora Rawhide
-
-* Thu Feb 27 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.6-2
-- Bump and rebuild for ocaml-gettext 0.5.0
-
-* Thu Feb 13 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.6-1
-- New upstream development version 2.7.6
-
-* Wed Feb 05 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.5-1
-- New upstream development version 2.7.5
-
-* Tue Feb 04 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.4-5
-- Bump and rebuild (RHBZ#2341511)
-
-* Sat Feb 01 2025 Björn Esser <besser82@fedoraproject.org> - 1:2.7.4-4
-- Add explicit BR: libxcrypt-devel
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.7.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Fri Jan 10 2025 Jerry James <loganjerry@gmail.com> - 1:2.7.4-2
-- OCaml 5.3.0 rebuild for Fedora 42
-
-* Mon Dec 09 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.4-1
-- New upstream development version 2.7.4
-
-* Mon Dec 02 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.3-1
-- New upstream development version 2.7.3
-
-* Mon Nov 18 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.2-1
-- New upstream development version 2.7.2
-
-* Tue Oct 22 2024 Richard W.M. Jones <rjones@redhat.com> - 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 <rjones@redhat.com> - 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 <rjones@redhat.com> - 1:2.6.0-1
 - New upstream stable version 2.6.0
 
@@ -527,18 +323,9 @@ done
 * Tue Jul 30 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.6-1
 - New upstream development version 2.5.6
 
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.5.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
 * Thu Jul 11 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.5-1
 - New upstream development version 2.5.5
 
-* Wed Jun 19 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.4-3
-- OCaml 5.2.0 ppc64le fix
-
-* Wed May 29 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.4-2
-- OCaml 5.2.0 for Fedora 41
-
 * Thu Apr 25 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.4-1
 - New upstream development version 2.5.4
 
@@ -554,7 +341,6 @@ done
 
 * Tue Mar 12 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.2-1
 - New development branch version 2.5.2
-- BR bash-completion-devel (new in Rawhide)
 
 * Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild