Rebase to stable branch version 2.0.0

resolves: rhbz#2059287, rhbz#1658126, rhbz#1788823, rhbz#1854275

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

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

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

@@ -1,4 +1,4 @@
-From b896dab3d8d4226b246e2e90d07235a38b6c8a79 Mon Sep 17 00:00:00 2001
+From 65a36d39e059329dd9d187f2e73938d317ba65c0 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 30 Sep 2014 10:50:27 +0100
 Subject: [PATCH] RHEL: v2v: Disable the --qemu-boot / -oo qemu-boot option
@@ -44,10 +44,10 @@ index a5f155cb..3a2e6238 100644
  =item B<-o json -os> C<DIRECTORY>
  
 diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
-index f50d27a0..9b1e44a1 100644
+index 60305397..8fd37567 100644
 --- a/docs/virt-v2v.pod
 +++ b/docs/virt-v2v.pod
-@@ -140,11 +140,6 @@ Since F<guest-domain.xml> contains the path(s) to the guest disk
+@@ -139,11 +139,6 @@ Since F<guest-domain.xml> contains the path(s) to the guest disk
  image(s) you do not need to specify the name of the disk image on the
  command line.
  
@@ -59,7 +59,7 @@ index f50d27a0..9b1e44a1 100644
  =head1 OPTIONS
  
  =over 4
-@@ -509,9 +504,6 @@ This is similar to I<-o local>, except that a shell script is written
+@@ -494,9 +489,6 @@ This is similar to I<-o local>, except that a shell script is written
  which you can use to boot the guest in qemu.  The converted disks and
  shell script are written to the directory specified by I<-os>.
  
@@ -69,7 +69,7 @@ index f50d27a0..9b1e44a1 100644
  =item B<-o> B<rhev>
  
  This is the same as I<-o rhv>.
-@@ -765,10 +757,6 @@ Print information about the source guest and stop.  This option is
+@@ -750,10 +742,6 @@ Print information about the source guest and stop.  This option is
  useful when you are setting up network and bridge maps.
  See L</Networks and bridges>.
  
@@ -95,10 +95,10 @@ index 700de058..3ad98a58 100644
      let output_storage =
        match options.output_storage with
 diff --git a/v2v/v2v.ml b/v2v/v2v.ml
-index 7bd47c1e..a66fa285 100644
+index 695152f2..1cbc5b50 100644
 --- a/v2v/v2v.ml
 +++ b/v2v/v2v.ml
-@@ -277,8 +277,6 @@ let rec main () =
+@@ -282,8 +282,6 @@ let rec main () =
        s_"Same as ‘-ip filename’";
      [ L"print-source" ], Getopt.Set print_source,
        s_"Print source and stop";

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

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

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

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

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

@@ -1,4 +1,4 @@
-From 46c843f5d5f19aad7bbfe155d20d5d9f26f8a030 Mon Sep 17 00:00:00 2001
+From 83698cb485f00bbccb779daf9018f464b53fbc47 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 2 Mar 2017 14:21:37 +0100
 Subject: [PATCH] RHEL: v2v: -i disk: force VNC as display (RHBZ#1372671)
@@ -9,7 +9,7 @@ The SDL output mode is not supported in RHEL's qemu-kvm.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/input/input_disk.ml b/input/input_disk.ml
-index 9fd08639..dc3bed6f 100644
+index bdb8a510..7efa2eb5 100644
 --- a/input/input_disk.ml
 +++ b/input/input_disk.ml
 @@ -76,7 +76,7 @@ module Disk = struct

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

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

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

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

0008-RHEL-Disable-o-glance.patch

@@ -1,4 +1,4 @@
-From 95640bac1c00014f94bec5539907fd92d7379ad2 Mon Sep 17 00:00:00 2001
+From b3dc49fab99f54b9eec4db3672a7a7a4507a710d Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Wed, 30 Jun 2021 11:15:52 +0100
 Subject: [PATCH] RHEL: Disable -o glance
@@ -100,10 +100,10 @@ index f5a3abad..1ab356e8 100644
  =head1 AUTHOR
  
 diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
-index 9b1e44a1..a1e00db8 100644
+index 8fd37567..73a43b76 100644
 --- a/docs/virt-v2v.pod
 +++ b/docs/virt-v2v.pod
-@@ -431,14 +431,6 @@ See L</Networks and bridges> below.
+@@ -416,14 +416,6 @@ See L</Networks and bridges> below.
  
  This is the same as I<-o local>.
  
@@ -118,7 +118,7 @@ index 9b1e44a1..a1e00db8 100644
  =item B<-o> B<json>
  
  Set the output method to I<json>.
-@@ -1170,11 +1162,6 @@ and output methods may use disk space, as outlined in the table below.
+@@ -1155,11 +1147,6 @@ and output methods may use disk space, as outlined in the table below.
  This temporarily places a full copy of the uncompressed source disks
  in C<$VIRT_V2V_TMPDIR> (or F</var/tmp>).
  
@@ -130,7 +130,7 @@ index 9b1e44a1..a1e00db8 100644
  =item I<-o local>
  
  =item I<-o qemu>
-@@ -1358,13 +1345,6 @@ instance.
+@@ -1343,13 +1330,6 @@ instance.
  Because of how Cinder volumes are presented as F</dev> block devices,
  using I<-o openstack> normally requires that virt-v2v is run as root.
  
@@ -169,10 +169,10 @@ index c0db9115..074b5e16 100755
  set -e
  set -x
 diff --git a/v2v/v2v.ml b/v2v/v2v.ml
-index a66fa285..c9ddce36 100644
+index 1cbc5b50..1a04b26b 100644
 --- a/v2v/v2v.ml
 +++ b/v2v/v2v.ml
-@@ -205,7 +205,6 @@ let rec main () =
+@@ -204,7 +204,6 @@ let rec main () =
      if !output_mode <> `Not_set then
        error (f_"%s option used more than once on the command line") "-o";
      match mode with
@@ -180,7 +180,7 @@ index a66fa285..c9ddce36 100644
      | "libvirt" -> output_mode := `Libvirt
      | "disk" | "local" -> output_mode := `Disk
      | "json" -> output_mode := `JSON
-@@ -257,7 +256,7 @@ let rec main () =
+@@ -262,7 +261,7 @@ let rec main () =
        s_"Map network ‘in’ to ‘out’";
      [ L"no-trim" ],  Getopt.String ("-", no_trim_warning),
        s_"Ignored for backwards compatibility";
@@ -189,7 +189,7 @@ index a66fa285..c9ddce36 100644
        s_"Set output mode (default: libvirt)";
      [ M"oa" ],       Getopt.String ("sparse|preallocated", set_output_alloc),
                                      s_"Set output allocation mode";
-@@ -325,8 +324,6 @@ virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp
+@@ -330,8 +329,6 @@ virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp
  
  virt-v2v -i disk disk.img -o local -os /var/tmp
  
@@ -206,7 +206,7 @@ index a66fa285..c9ddce36 100644
        pr "output:json\n";
        pr "output:libvirt\n";
        pr "output:local\n";
-@@ -486,7 +482,6 @@ read the man page virt-v2v(1).
+@@ -490,7 +486,6 @@ read the man page virt-v2v(1).
      | `Disk -> (module Output_disk.Disk)
      | `Null -> (module Output_null.Null)
      | `QEmu -> (module Output_qemu.QEMU)

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

@@ -1,4 +1,4 @@
-From c7c14141d1c985dbba8749f9209b78d96200c2b3 Mon Sep 17 00:00:00 2001
+From 3fe42109385e17597f0a91fa9a7a19320a9a2588 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 2 Dec 2021 11:56:05 +0000
 Subject: [PATCH] RHEL: Remove the --in-place option
@@ -6,138 +6,69 @@ Subject: [PATCH] RHEL: Remove the --in-place option
 This disables the virt-v2v --in-place option which we do not
 wish to support in RHEL.
 ---
- docs/virt-v2v.pod | 49 -----------------------------------------------
+ docs/virt-v2v.pod | 8 --------
- v2v/v2v.ml        |  8 --------
+ v2v/v2v.ml        | 8 --------
- 2 files changed, 57 deletions(-)
+ 2 files changed, 16 deletions(-)
 
 diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
-index a1e00db8..a3fc3dc8 100644
+index 73a43b76..53c9afae 100644
 --- a/docs/virt-v2v.pod
 +++ b/docs/virt-v2v.pod
-@@ -8,10 +8,6 @@ virt-v2v - Convert a guest to use KVM
+@@ -21,9 +21,6 @@ There is also a companion front-end called L<virt-p2v(1)> which comes
-           [-o mode] [other -o* options]
+ as an ISO, CD or PXE image that can be booted on physical machines to
-           [guest|filename]
+ virtualize those machines (physical to virtual, or p2v).
  
-- virt-v2v --in-place
+-For in-place conversion, there is a separate tool called
--          [-i mode] [other -i* options]
+-L<virt-v2v-in-place(1)>.
--          [guest|filename]
 -
- =head1 DESCRIPTION
+ =head2 Input and Output
  
- Virt-v2v converts a single guest from a foreign hypervisor to run on
+ You normally run virt-v2v with several I<-i*> options controlling the
-@@ -37,12 +33,6 @@ The input and output sides of virt-v2v are separate and unrelated.
+@@ -36,10 +33,6 @@ The input and output sides of virt-v2v are separate and unrelated.
  Virt-v2v can read from any input and write to any output.  Therefore
  these sides of virt-v2v are documented separately in this manual.
  
 -Virt-v2v normally copies from the input to the output, called "copying
 -mode".  In this case the source guest is always left unchanged.
--In-place conversion (I<--in-place>) only uses the I<-i*> options and
+-In-place conversions may be done using L<virt-v2v-in-place(1)>.
--modifies the source guest in-place.  (See L</In-place conversion>
--below.)
 -
  =head2 Other virt-v2v topics
  
  L<virt-v2v-support(1)> — Supported hypervisors, virtualization
-@@ -289,20 +279,6 @@ For I<-i disk> only, this specifies the format of the input disk
+@@ -1586,7 +1579,6 @@ L<https://rwmj.wordpress.com/2015/09/18/importing-kvm-guests-to-ovirt-or-rhev/#c
- image.  For other input methods you should specify the input
+ =head1 SEE ALSO
- format in the metadata.
  
--=item B<--in-place>
+ L<virt-p2v(1)>,
--
+-L<virt-v2v-in-place(1)>,
--Do not create an output virtual machine in the target hypervisor.
+ L<virt-customize(1)>,
--Instead, adjust the guest OS in the source VM to run in the input
+ L<virt-df(1)>,
--hypervisor.
+ L<virt-filesystems(1)>,
--
--This mode is meant for integration with other toolsets, which take the
--responsibility of converting the VM configuration, providing for
--rollback in case of errors, transforming the storage, etc.
--
--See L</In-place conversion> below.
--
--Conflicts with all I<-o *> options.
--
- =item B<-io> OPTION=VALUE
- 
- Set input option(s) related to the current input mode or transport.
-@@ -1417,31 +1393,6 @@ that instead.
-    </devices>
-  </domain>
- 
--=head2 In-place conversion
--
--It is also possible to use virt-v2v in scenarios where a foreign VM
--has already been imported into a KVM-based hypervisor, but still needs
--adjustments in the guest to make it run in the new virtual hardware.
--
--In that case it is assumed that a third-party tool has created the
--target VM in the supported KVM-based hypervisor based on the source VM
--configuration and contents, but using virtual devices more appropriate
--for KVM (e.g. virtio storage and network, etc.).
--
--Then, to make the guest OS boot and run in the changed environment,
--one can use:
--
-- virt-v2v -ic qemu:///system converted_vm --in-place
--
--Virt-v2v will analyze the configuration of C<converted_vm> in the
--C<qemu:///system> libvirt instance, and apply various fixups to the
--guest OS configuration to make it match the VM configuration.  This
--may include installing virtio drivers, configuring the bootloader, the
--mountpoints, the network interfaces, and so on.
--
--Should an error occur during the operation, virt-v2v exits with an
--error code leaving the VM in an undefined state.
--
- =head2 Machine readable output
- 
- The I<--machine-readable> option can be used to make the output more
 diff --git a/v2v/v2v.ml b/v2v/v2v.ml
-index c9ddce36..6859a02c 100644
+index 1a04b26b..08d5a34c 100644
 --- a/v2v/v2v.ml
 +++ b/v2v/v2v.ml
-@@ -183,7 +183,6 @@ let rec main () =
+@@ -226,12 +226,6 @@ let rec main () =
-   let output_storage = ref None in
+     warning (f_"the --vmtype option has been removed and now does nothing")
+   in
  
-   (* Other options that we handle here. *)
+-  (* Options that are errors. *)
--  let in_place = ref false in
+-  let in_place_error _ =
-   let print_source = ref false in
+-    error (f_"The --in-place option has been replaced by the \
- 
+-              ‘virt-v2v-in-place’ program")
-   let input_mode = ref `Not_set in
+-  in
-@@ -248,8 +247,6 @@ let rec main () =
+-
+   let argspec = [
+     [ L"bandwidth" ], Getopt.String ("bps", set_string_option_once "--bandwidth" bandwidth),
+                                     s_"Set bandwidth to bits per sec";
+@@ -253,8 +247,6 @@ let rec main () =
                                      s_"Use password from file to connect to input hypervisor";
      [ M"it" ],       Getopt.String ("transport", set_string_option_once "-it" input_transport),
                                      s_"Input transport";
--    [ L"in-place" ], Getopt.Set in_place,
+-    [ L"in-place" ], Getopt.Unit in_place_error,
--      s_"Only tune the guest in the input VM";
+-                                    s_"Use virt-v2v-in-place instead";
      [ L"mac" ],      Getopt.String ("mac:network|bridge|ip:out", add_mac),
        s_"Map NIC to network or bridge or assign static IP";
      [ S 'n'; L"network" ], Getopt.String ("in:out", add_network),
-@@ -347,7 +344,6 @@ read the man page virt-v2v(1).
- 
-   (* Dereference the arguments. *)
-   let args = List.rev !args in
--  let in_place = !in_place in
-   let input_conn = !input_conn in
-   let input_mode = !input_mode in
-   let input_transport =
-@@ -367,9 +363,6 @@ read the man page virt-v2v(1).
-   let root_choice = !root_choice in
-   let static_ips = !static_ips in
- 
--  (* --in-place isn't implemented yet - TODO *)
--  if in_place then error "XXX --in-place option is not implemented yet";
--
-   (* No arguments and machine-readable mode?  Print out some facts
-    * about what this binary supports.
-    *)
-@@ -383,7 +376,6 @@ read the man page virt-v2v(1).
-       pr "vddk\n";
-       pr "colours-option\n";
-       pr "vdsm-compat-option\n";
--      pr "in-place\n";
-       pr "io/oo\n";
-       pr "mac-option\n";
-       pr "bandwidth-option\n";
 -- 
 2.31.1
 

copy-patches.sh

@@ -7,7 +7,7 @@ set -e
 #   ./copy-patches.sh
 
 project=virt-v2v
-rhel_version=9.0.0
+rhel_version=9.1
 
 # Check we're in the right directory.
 if [ ! -f $project.spec ]; then

sources

@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-1.45.99.tar.gz) = 46fd087e584fee94a95f229ef860220201f75b85cf4cb4137349cc64e447094d5c1db192121095779f99a997336aa547ba7d2aed2d1778e381cd003a8ab83327
+SHA512 (virt-v2v-2.0.0.tar.gz) = 0ccf9e9141a0166f969383f9e103ffa11fa2ce00a5fbf4ada6c4480b888886a5a149b33d905f0f1947edaec14d16dd89a15ef53dd0cc042b29d473235430f5de
-SHA512 (virt-v2v-1.45.99.tar.gz.sig) = d34ca220bc2161357ddf32ccb46117fdbcb98347384e284027a02e67c2ebe9851b1e5deb3e59607d84916bb689dd5e053462d862aff3a813021493fd33f1f1b9
+SHA512 (virt-v2v-2.0.0.tar.gz.sig) = e1c7e308043951c2aab59d288daa8cfd0da4794f566811b2bab6e138ea511f337e10ab2118973f08df1b29406e1bf12d09591805dd21621a6350b628715a9b99

virt-v2v.spec

@@ -1,3 +1,4 @@
+%undefine _package_note_flags
 # If we should verify tarball signature with GPGv2.
 %global verify_tarball_signature 1
 
@@ -10,11 +11,11 @@
 %endif
 
 # The source directory.
-%global source_directory 1.45-development
+%global source_directory 2.0-stable
 
 Name:          virt-v2v
 Epoch:         1
-Version:       1.45.99
+Version:       2.0.0
 Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
@@ -31,6 +32,17 @@ Source2:       libguestfs.keyring
 # Maintainer script which helps with handling patches.
 Source3:       copy-patches.sh
 
+# Patches.
+Patch0001:     0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch
+Patch0002:     0002-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch
+Patch0003:     0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch
+Patch0004:     0004-RHEL-Fixes-for-libguestfs-winsupport.patch
+Patch0005:     0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
+Patch0006:     0006-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch
+Patch0007:     0007-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
+Patch0008:     0008-RHEL-Disable-o-glance.patch
+Patch0009:     0009-RHEL-Remove-the-in-place-option.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
@@ -48,20 +60,6 @@ ExcludeArch:   %{ix86}
 ExclusiveArch: x86_64
 %endif
 
-# Downstream (RHEL-only) patches.
-%if 0%{?rhel}
-# Patches.
-Patch0001:     0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch
-Patch0002:     0002-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch
-Patch0003:     0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch
-Patch0004:     0004-RHEL-Fixes-for-libguestfs-winsupport.patch
-Patch0005:     0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
-Patch0006:     0006-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch
-Patch0007:     0007-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
-Patch0008:     0008-RHEL-Disable-o-glance.patch
-Patch0009:     0009-RHEL-Remove-the-in-place-option.patch
-%endif
-
 %if 0%{patches_touch_autotools}
 BuildRequires: autoconf, automake, libtool
 %endif
@@ -69,20 +67,20 @@ BuildRequires: autoconf, automake, libtool
 BuildRequires: make
 BuildRequires: /usr/bin/pod2man
 BuildRequires: gcc
-BuildRequires: ocaml >= 4.01
+BuildRequires: ocaml >= 4.04
 
-BuildRequires: libguestfs-devel >= 1:1.42
+BuildRequires: libguestfs-devel >= 1:1.44
 BuildRequires: augeas-devel
 BuildRequires: bash-completion
 BuildRequires: file-devel
 BuildRequires: gettext-devel
 BuildRequires: jansson-devel
-BuildRequires: libnbd-devel >= 1.10.3
+BuildRequires: libnbd-devel
 BuildRequires: libosinfo-devel
 BuildRequires: libvirt-daemon-kvm
 BuildRequires: libvirt-devel
 BuildRequires: libxml2-devel
-BuildRequires: pcre-devel
+BuildRequires: pcre2-devel
 BuildRequires: perl(Sys::Guestfs)
 BuildRequires: po4a
 BuildRequires: /usr/bin/virsh
@@ -118,7 +116,7 @@ Requires:      gawk
 Requires:      gzip
 Requires:      unzip
 Requires:      curl
-Requires:      openssh-clients >= 8.7p1
+Requires:      openssh-clients >= 8.8p1
 Requires:      %{_bindir}/virsh
 
 # Ensure the UEFI firmware is available, to properly convert
@@ -130,12 +128,11 @@ Requires:      edk2-ovmf
 Requires:      edk2-aarch64
 %endif
 
-Requires:      platform-python
+Requires:      libnbd >= 1.10
-Requires:      libnbd >= 1.8.2-2.el9
 Requires:      %{_bindir}/qemu-nbd
 Requires:      %{_bindir}/nbdcopy
 Requires:      %{_bindir}/nbdinfo
-Requires:      nbdkit-server >= 1.28.3-2.el9
+Requires:      nbdkit-server >= 1.28.3-1.el9
 Requires:      nbdkit-curl-plugin
 Requires:      nbdkit-file-plugin
 Requires:      nbdkit-nbd-plugin
@@ -147,7 +144,8 @@ Requires:      nbdkit-vddk-plugin
 %endif
 Requires:      nbdkit-blocksize-filter
 Requires:      nbdkit-cacheextents-filter
-Requires:      nbdkit-cow-filter >= 1.26.5-1.el9
+Requires:      nbdkit-cow-filter >= 1.28.3-1.el9
+Requires:      nbdkit-multi-conn-filter
 Requires:      nbdkit-rate-filter
 Requires:      nbdkit-readahead-filter
 Requires:      nbdkit-retry-filter
@@ -231,13 +229,21 @@ make V=1 %{?_smp_mflags}
 # Delete libtool crap.
 find $RPM_BUILD_ROOT -name '*.la' -delete
 
-# Virt-tools data directory.  This contains a symlink to rhsrvany.exe
+# Virt-tools data directory.  This contains symlinks to rhsrvany.exe
-# which is satisfied by the dependency on mingw32-srvany.
+# and pnp_wait.exe which are satisfied by the dependency on
+# mingw32-srvany.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/virt-tools
 pushd $RPM_BUILD_ROOT%{_datadir}/virt-tools
-ln -sf /usr/i686-w64-mingw32/sys-root/mingw/bin/rhsrvany.exe
+ln -sf ../../i686-w64-mingw32/sys-root/mingw/bin/rhsrvany.exe
+ln -sf ../../i686-w64-mingw32/sys-root/mingw/bin/pnp_wait.exe
 popd
 
+%if 0%{?rhel}
+# On RHEL remove virt-v2v-in-place.
+rm $RPM_BUILD_ROOT%{_bindir}/virt-v2v-in-place
+rm $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v-in-place.1*
+%endif
+
 # Find locale files.
 %find_lang %{name}
 
@@ -274,14 +280,21 @@ popd
 %license COPYING
 %doc README
 %{_bindir}/virt-v2v
+%if !0%{?rhel}
+%{_bindir}/virt-v2v-in-place
+%endif
 %{_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-in-place.1*
+%endif
 %{_mandir}/man1/virt-v2v-output-local.1*
 %{_mandir}/man1/virt-v2v-output-openstack.1*
 %{_mandir}/man1/virt-v2v-output-rhv.1*
 %{_mandir}/man1/virt-v2v-release-notes-1.42.1*
+%{_mandir}/man1/virt-v2v-release-notes-2.0.1*
 %{_mandir}/man1/virt-v2v-support.1*
 %{_datadir}/virt-tools
 
@@ -302,6 +315,10 @@ popd
 
 
 %changelog
+* Mon Mar 14 2022 Richard W.M. Jones <rjones@redhat.com> - 1:2.0.0-1
+- Rebase to stable branch version 2.0.0
+  resolves: rhbz#2059287, rhbz#1658126, rhbz#1788823, rhbz#1854275
+
 * Tue Feb 15 2022 Richard W.M. Jones <rjones@redhat.com> - 1:1.45.99-1
 - Rebase to upstream 1.45.99.
 - Add check for sufficient free space in the host