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

.gitignore

@@ -1,3 +1,5 @@
+*~
+
 # RPM target directories
 /x86_64
 
@@ -8,4 +10,5 @@
 /results_virt-v2v/
 
 # Source
-/virt-v2v-v*.tar.gz
+/virt-v2v-*.tar.gz
+/virt-v2v-*.tar.gz.sig

copy-patches.sh

@@ -0,0 +1,55 @@
+#!/bin/bash -
+
+set -e
+
+# Maintainer script to copy patches from the git repo to the current
+# directory.  Use it like this:
+#   ./copy-patches.sh
+
+rhel_version=av-8.3.0
+
+# Check we're in the right directory.
+if [ ! -f virt-v2v.spec ]; then
+    echo "$0: run this from the directory containing 'virt-v2v.spec'"
+    exit 1
+fi
+
+git_checkout=$HOME/d/virt-v2v-rhel-$rhel_version
+if [ ! -d $git_checkout ]; then
+    echo "$0: $git_checkout does not exist"
+    echo "This script is only for use by the maintainer when preparing a"
+    echo "virt-v2v release on RHEL."
+    exit 1
+fi
+
+# Get the base version of virt-v2v.
+version=`grep '^Version:' virt-v2v.spec | awk '{print $2}'`
+tag="v$version"
+
+# Remove any existing patches.
+git rm -f [0-9]*.patch ||:
+rm -f [0-9]*.patch
+
+# Get the patches.
+(cd $git_checkout; rm -f [0-9]*.patch; git format-patch -N --submodule=diff $tag)
+mv $git_checkout/[0-9]*.patch .
+
+# Remove any not to be applied.
+rm -f *NOT-FOR-RPM*.patch
+
+# Add the patches.
+git add [0-9]*.patch
+
+# Print out the patch lines.
+echo
+echo "--- Copy the following text into virt-v2v.spec file"
+echo
+
+echo "# Patches."
+for f in [0-9]*.patch; do
+    n=`echo $f | awk -F- '{print $1}'`
+    echo "Patch$n:     $f"
+done
+
+echo
+echo "--- End of text"

gating.yaml

@@ -0,0 +1,7 @@
+--- !Policy
+product_versions:
+  - rhel-*
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
+  - !PassingTestCaseRule {test_case_name: libvirt-ci.v2v.brew-build.gating.x86_64.tier1.functional}

sources

@@ -1 +1,2 @@
-652decfdf85a6d9091de2c0d3cf59489  virt-v2v-v0.9.0.tar.gz
+SHA512 (virt-v2v-2.10.0.tar.gz) = 035f2181c1cc5f482e96d3e21b513b95939ca224d71ac6ad938842d5af5d60ef07db1600d2ccb609dc2042b1c74088f6f39ffbe595cb51e80278ecb50c314515
+SHA512 (virt-v2v-2.10.0.tar.gz.sig) = cb6301224ef00577a9cd0fc8fa504e583eb447341bd3849e6854f2d78ae72ca39bca68b70f30efd3d1d64480acf161c5e4bc9ba943595ef4dd2a654c3268aa66

tests/basic-test.sh

@@ -0,0 +1,13 @@
+#!/bin/bash -
+set -e
+set -x
+
+# This only makes sure that virt-v2v isn't totally broken.
+# virt-v2v is extensively tested on real guests by the QE
+# team using a mix of automated and manual testing.
+
+# Fix libvirt.
+systemctl restart virtqemud virtsecretd virtstoraged virtnetworkd
+
+virt-builder fedora-30
+virt-v2v -i disk fedora-30.img -o null

tests/tests.yml

@@ -0,0 +1,13 @@
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    required_packages:
+    - virt-v2v
+    - guestfs-tools
+    - libvirt-daemon-kvm
+    tests:
+    - simple:
+        dir: .
+        run: ./basic-test.sh

virt-v2v-use-appliance-backend.patch

@@ -1,15 +0,0 @@
---- virt-v2v-v0.9.0.old/lib/Sys/VirtConvert/GuestfsHandle.pm	2012-12-06 15:09:51.000000000 +0000
-+++ virt-v2v-v0.9.0/lib/Sys/VirtConvert/GuestfsHandle.pm	2013-07-03 14:48:53.049335387 +0100
-@@ -76,6 +76,12 @@
-         my $interface = "ide";
- 
-         $g = Sys::Guestfs->new();
-+
-+        # Fedora-specific patch: The libvirt backend used in Fedora >=
-+        # 18 does not support setting iface parameters.  Therefore
-+        # ensure we are using the direct (appliance) backend.
-+        $g->set_attach_method ("appliance");
-+
-         foreach my $disk (@{$disks}) {
-             my ($name, $path, $format) = @$disk;
- 

virt-v2v-v0.9.1-The-license-metadata-must-be-a-list.patch

@@ -1,34 +0,0 @@
-From 6ea7529da49959ff164f39eae4423fdc730f9753 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Fri, 27 Jun 2014 17:20:00 +0200
-Subject: [PATCH] The license metadata must be a list
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-CPAN::Meta::Spec defines the license value must be an array reference.
-However current Build.PL uses simple scalar. This breaks generating
-META.* files which breaks tests with recent Module::Build 0.4205.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1083430
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- Build.PL | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Build.PL b/Build.PL
-index 55cee55..0ccace3 100644
---- a/Build.PL
-+++ b/Build.PL
-@@ -316,7 +316,7 @@ my $build = $class->new (
-     script_files => [ 'v2v/virt-v2v.pl', 'p2v/server/virt-p2v-server.pl' ],
-     meta_add => {
-         resources => {
--          license => "http://www.gnu.org/licenses/gpl.html",
-+          license => [ "http://www.gnu.org/licenses/gpl.html" ],
-           homepage =>  "http://people.redhat.com/mbooth/virt-v2v/",
-           repository => "git://git.fedorahosted.org/virt-v2v.git",
-           MailingList => "http://www.redhat.com/mailman/listinfo/libguestfs",
--- 
-1.9.3
-