New upstream release 1.42.2

Synchronise with Fedora 37:
  * Uses PCRE2 instead of PCRE.
  * Remove Obsolete/Provides etc used for upgrades from Fedora 31.
  * libguestfs-tools-c was renamed to guestfs-tools in Fedora 34.
  * gnulib removed upstream.
  * Some specfile modernization.
Add gating tests
  resolves: rhbz#1990052

.gitignore

@@ -1,3 +1,3 @@
-/virt-p2v-1.41.0.tar.gz
+*~
-/virt-p2v-1.42.0.tar.gz
+/virt-p2v-*.tar.gz
-/virt-p2v-1.42.0.tar.gz.sig
+/virt-p2v-*.tar.gz.sig

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

sources

@@ -1,2 +1,2 @@
-SHA512 (virt-p2v-1.42.0.tar.gz) = 215906997bd63fe9c76c599036ca204078ce4f059f87a4f1f1422d9f844156790eafa7654692776d4e5ba9936edb1042b485b300baa1bbc2a8ecb645bae04b80
+SHA512 (virt-p2v-1.42.2.tar.gz) = 5310c4b09bfbb4652ae73dadc3906d8fbc2f3183cc9b1e90fc5bd5e159469f4fb3d74a710cb76f2ec65c2a55c219cd7425c2eaa4993f0152dc19fde68cc2e5c4
-SHA512 (virt-p2v-1.42.0.tar.gz.sig) = cc1047fa1ce53ee4d997cc9eae66fdabb66ba6414392ac585ea794547e76e88b245484e5b452a899f26483d6bfcfa7a71bb9c9e4e676d1914708508bb811d6f4
+SHA512 (virt-p2v-1.42.2.tar.gz.sig) = b13c788bf71a75b1ed23262af33014f99e26f7b5462cdc14c1194347a7748975f92b4336a7757dd4e42269b975f26d9206c29e080b40ef190ce41671aef7a793

tests/basic-test.sh

@@ -0,0 +1,19 @@
+#!/bin/bash -
+set -e
+set -x
+
+# This is a difficult package to test in gating because building the
+# virt-p2v ISO requires virt-builder, and even if we run it, it
+# doesn't prove anything useful.  Doing a full P2V conversion is even
+# more difficult (and requires virt-v2v which we are unlikely to
+# have).  So just check that the virt-p2v binary looks sane.
+tmpdir="$( mktemp -d )"
+cd "$tmpdir"
+xzcat /usr/lib64/virt-p2v/virt-p2v.xz > virt-p2v
+chmod +x virt-p2v
+./virt-p2v --version
+./virt-p2v --help
+./virt-p2v --long-options
+./virt-p2v --short-options
+cd
+rm -r "$tmpdir"

tests/tests.yml

@@ -0,0 +1,12 @@
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    required_packages:
+    - coreutils
+    - virt-p2v
+    tests:
+    - simple:
+        dir: .
+        run: ./basic-test.sh

virt-p2v.spec

@@ -9,8 +9,8 @@
 Summary:       Convert a physical machine to run on KVM
 Name:          virt-p2v
 Epoch:         1
-Version:       1.42.0
+Version:       1.42.2
-Release:       6%{?dist}
+Release:       1%{?dist}
 License:       GPLv2+
 
 # virt-p2v works only on x86_64 at the moment.  It requires porting
@@ -38,7 +38,7 @@ BuildRequires: perl(Pod::Man)
 BuildRequires: perl(List::MoreUtils)
 BuildRequires: /usr/bin/pod2text
 BuildRequires: libxml2-devel
-BuildRequires: pcre-devel
+BuildRequires: pcre2-devel
 BuildRequires: bash-completion
 BuildRequires: xz
 BuildRequires: gtk3-devel
@@ -49,30 +49,18 @@ BuildRequires: gnupg2
 %endif
 
 # Test suite requirements.
-BuildRequires: /usr/bin/qemu-nbd
+BuildRequires: nbdkit
-
-# https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries#Packages_granted_exceptions
-Provides:      bundled(gnulib)
-
 
 Requires:      gawk
 Requires:      gzip
 
 # virt-p2v-make-disk runs virt-builder:
-Requires:      libguestfs-tools-c
+Requires:      guestfs-tools
 
 # virt-p2v-make-kickstart runs strip:
 Requires:      binutils
 
 
-# Migrate from the old virt-p2v-maker:
-Provides: virt-p2v-maker = 1:%{version}-%{release}
-Obsoletes: virt-p2v-maker < 1:1.41.5
-
-# The bash completion for p2v were shipped with the others of libguestfs:
-Obsoletes: libguestfs-bash-completion < 1:1.41.5
-
-
 %description
 Virt-p2v converts (virtualizes) physical machines so they can be run
 as virtual machines under KVM.
@@ -89,20 +77,17 @@ To convert virtual machines from other hypervisors, see virt-v2v.
 %if 0%{verify_tarball_signature}
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %endif
-%setup -q
+%autosetup -p1
-%autopatch -p1
 
 
 %build
 %configure \
-  --with-extra="fedora=%{fedora},release=%{release}" \
+  --with-extra="fedora=%{fedora},release=%{release}"
-  --disable-gnulib-tests
 
-make V=1 %{?_smp_mflags}
+%make_build
 
 
 %check
-
 if ! make check; then
     cat test-suite.log
     exit 1
@@ -110,13 +95,14 @@ fi
 
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+%make_install
 
 # Delete the development man pages.
 rm $RPM_BUILD_ROOT%{_mandir}/man1/p2v-building.1*
 rm $RPM_BUILD_ROOT%{_mandir}/man1/p2v-hacking.1*
 rm $RPM_BUILD_ROOT%{_mandir}/man1/p2v-release-notes.1*
 
+
 %files
 %doc README
 %license COPYING
@@ -133,6 +119,17 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/p2v-release-notes.1*
 
 
 %changelog
+* Wed Aug 03 2022 Richard W.M. Jones <rjones@redhat.com> - 1:1.42.2-1
+- New upstream release 1.42.2
+- Synchronise with Fedora 37:
+  * Uses PCRE2 instead of PCRE.
+  * Remove Obsolete/Provides etc used for upgrades from Fedora 31.
+  * libguestfs-tools-c was renamed to guestfs-tools in Fedora 34.
+  * gnulib removed upstream.
+  * Some specfile modernization.
+- Add gating tests
+  resolves: rhbz#1990052
+
 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.42.0-6
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688