.gitignore

@@ -1,2 +1,2 @@
 SOURCES/libguestfs.keyring
-SOURCES/virt-p2v-1.42.2.tar.gz
+SOURCES/virt-p2v-1.42.0.tar.gz

.virt-p2v.metadata

@@ -1,2 +1,2 @@
 1bbc40f501a7fef9eef2a39b701a71aee2fea7c4 SOURCES/libguestfs.keyring
-3dfc27df2fac9ac862074906be8c0b9d6c314c74 SOURCES/virt-p2v-1.42.2.tar.gz
+68f3c5ef858b8dc7e98e9a46289e43aaf7d52f47 SOURCES/virt-p2v-1.42.0.tar.gz

SOURCES/virt-p2v-1.42.0.tar.gz.sig

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAl3fxr0RHHJpY2hAYW5u
+ZXhpYS5vcmcACgkQkXOPc+G3aKDAfA/+PI6/c9bsoFa8VZ9tFW3cYP+9yy9ZK37e
+xq2lwhvEvNPBsSeiZUMK5POOebTOzCrzTZ0LwpGDCy4q83nOE7BM2pDa0zPh461l
+QKYqnfn04h3zx9LNPne1Qj0g5jA0oXtImTDPMwy0VgX9Eqh0Fc/Hc55UHP5UufeN
+LllyNhrxQUXvJ4b0Z/9kPAaJTayk0CQqAI0A008Bmc/EzH2dS/nHQofgiKBCxKah
+pNPI2bTBe/41XjFU1t36Zi/DNixTexXp4KclQX2PlGP3RR6+bJZY/OYH8G8zOS6d
+FnFZ5GdS+Rko+cvcJAGNkewAlkDUzsEAZ016ERDTwM4Fyx9VdcDQc0s07XpkR+jQ
+zM8wsaZjKIp99Snk2SwTDReXnUp/rNm0Wq3HeY3bowWVVdn3ivaDbMzipEoka9mz
+jvxNBUXISf/aenQ//PiqXmV3Q8q9oIZhFiq4/14N5bc8wauDnD+xnzo1u5ciOV69
+32rk3OXAXHMdn/ARpSTtbnv2QCAAjqDRlm4+xQmulZu6DCvnlUHvzsHErz40hrj8
+LMNA1Pw5MW8v72YLJKRDzQ1R6ELcR2SbYGuHYCN0wqDJXh7RAvTFQusYSBdEYC4F
+p9mWi9IWTkoV0RKC2b6nRGkVMpPmwZ4le+sYTawy1P/LM7UCCJHaFCp+pIZ09gVc
+SRk4FEKh1RI=
+=pvKa
+-----END PGP SIGNATURE-----

SOURCES/virt-p2v-1.42.2.tar.gz.sig

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmLqT0URHHJpY2hAYW5u
-ZXhpYS5vcmcACgkQkXOPc+G3aKD49BAAuU88WgudYXMB2oUGOrMQUpyChuN/mTkI
-dwIKxZVs/i7hP+HZf1jZS4Hq30Nr5kJfxA50BDfti9YHJJGh0A+GXQYJiIv+5YWp
-y+4o/DCR7pwfcVgFZCfzbH9ngahTZmbggESvRv4+kcqcDOnCrguEQfQFx8WXD5WS
-baJr2DQMS/JfG5W3zpA9k2nVPcBZOx9QTqFYe/W7fIXWZJ3R133bEFDzWeZlSb/W
-caOhHFNXBMRMNsezFT30azcV0/oPax+5lmZMmjUv4ip31uzdruQSDx1n0hsO84jK
-zkQL3yNdZ+SvygkfdBBBsreWmPv6ob9WSL0ow4ZmpyNkc7dmR5ewazEykGH4Vk3l
-skye0/OThAVxcYHiS64Imp7itkvM3wyQvRQT7/01NY/85/5uKqOwYGayEynis2/v
-aDEBBIongKUBj5Yzln8gNjLwDv1zWDs2cZAmBP74X1I/in5LALdZ9lrlKg9L2q4s
-6G1KSkZqA7Ez8lgZQLR69t9X6lHJdutmCoJyGNDl6V0/k4kE2quhlJvgqfiEgTqG
-PviunnqtjFfVdC7ssgASuXZNIocy4Pal4ckhwoU3gTSoLa82TJ7LoVbdttXQGzN7
-oKdJNxY3xFtJKvG+qYL3JshKbri+C7IkC0ohVEi/3MgqHmtJEmbN7uW85ongqCfF
-INGTQU7G4/s=
-=x4QR
------END PGP SIGNATURE-----

SPECS/virt-p2v.spec

@@ -9,8 +9,8 @@
 Summary:       Convert a physical machine to run on KVM
 Name:          virt-p2v
 Epoch:         1
-Version:       1.42.2
-Release:       1.1%{?dist}
+Version:       1.42.0
+Release:       5%{?dist}
 License:       GPLv2+
 
 # virt-p2v works only on x86_64 at the moment.  It requires porting
@@ -31,14 +31,13 @@ Source2:       libguestfs.keyring
 %endif
 
 # Basic build requirements.
-BuildRequires: make
 BuildRequires: gcc
 BuildRequires: perl(Pod::Simple)
 BuildRequires: perl(Pod::Man)
 BuildRequires: perl(List::MoreUtils)
 BuildRequires: /usr/bin/pod2text
 BuildRequires: libxml2-devel
-BuildRequires: pcre2-devel
+BuildRequires: pcre-devel
 BuildRequires: bash-completion
 BuildRequires: xz
 BuildRequires: gtk3-devel
@@ -49,17 +48,7 @@ BuildRequires: gnupg2
 %endif
 
 # Test suite requirements.
-BuildRequires: nbdkit
-
-Requires:      gawk
-Requires:      gzip
-
-# virt-p2v-make-disk runs virt-builder:
-Requires:      guestfs-tools
-
-# virt-p2v-make-kickstart runs strip:
-Requires:      binutils
-
+BuildRequires: /usr/bin/qemu-nbd
 
 %description
 Virt-p2v converts (virtualizes) physical machines so they can be run
@@ -73,21 +62,59 @@ complete the conversion.
 To convert virtual machines from other hypervisors, see virt-v2v.
 
 
+%package maker
+Summary:       Convert a physical machine to run on KVM
+
+# https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries#Packages_granted_exceptions
+Provides:      bundled(gnulib)
+
+
+Requires:      gawk
+Requires:      gzip
+Requires:      xz
+
+# virt-p2v-make-disk runs virt-builder:
+Requires:      libguestfs-tools-c
+
+# virt-p2v-make-kickstart runs strip:
+Requires:      binutils
+
+
+# The bash completion for p2v were shipped with the others of libguestfs:
+Obsoletes: libguestfs-bash-completion < 1:1.38.4-15
+
+
+%description maker
+Virt-p2v converts (virtualizes) physical machines so they can be run
+as virtual machines under KVM.
+
+This package contains the tools needed to make a virt-p2v boot CD or
+USB key which is booted on the physical machine to perform the
+conversion.  You also need virt-v2v installed somewhere else to
+complete the conversion.
+
+To convert virtual machines from other hypervisors, see virt-v2v.
+
+
 %prep
 %if 0%{verify_tarball_signature}
-%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
+tmphome="$(mktemp -d)"
+gpgv2 --homedir "$tmphome" --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
 %endif
-%autosetup -p1
+%setup -q
+%autopatch -p1
 
 
 %build
 %configure \
-  --with-extra="fedora=%{fedora},release=%{release}"
+  --with-extra="rhel=%{rhel},release=%{release}" \
+  --disable-gnulib-tests
 
-%make_build
+make V=1 %{?_smp_mflags}
 
 
 %check
+
 if ! make check; then
     cat test-suite.log
     exit 1
@@ -95,61 +122,48 @@ fi
 
 
 %install
-%make_install
+make DESTDIR=$RPM_BUILD_ROOT 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*
 
+# Delete kiwi tools.
+rm $RPM_BUILD_ROOT%{_bindir}/virt-p2v-make-kiwi
+rm $RPM_BUILD_ROOT%{_mandir}/man1/virt-p2v-make-kiwi.1*
+rm $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/virt-p2v-make-kiwi
 
-%files
+%files maker
 %doc README
 %license COPYING
 %{_bindir}/virt-p2v-make-disk
 %{_bindir}/virt-p2v-make-kickstart
-%{_bindir}/virt-p2v-make-kiwi
 %{_datadir}/bash-completion/completions/virt-*
 %{_datadir}/virt-p2v
 %{_libdir}/virt-p2v
 %{_mandir}/man1/virt-p2v-make-disk.1*
 %{_mandir}/man1/virt-p2v-make-kickstart.1*
-%{_mandir}/man1/virt-p2v-make-kiwi.1*
 %{_mandir}/man1/virt-p2v.1*
 
 
 %changelog
-* Wed Aug 03 2022 Richard W.M. Jones <rjones@redhat.com> - 1:1.42.2-1.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
+* Fri Mar 06 2020 Pino Toscano <ptoscano@redhat.com> - 1:1.42.0-5
+- Remove virt-p2v-make-kiwi, as it is not supported, and was not
+  shipped already.
 
-* 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
+* Fri Feb 21 2020 Pino Toscano <ptoscano@redhat.com> - 1:1.42.0-4
+- Copy %description also for the source, so tools are less confused
+  about it.
+- Fix the "extra" addition to the version to refer to rhel.
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.42.0-5
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Wed Dec 11 2019 Pino Toscano <ptoscano@redhat.com> - 1:1.42.0-3
+- Explicitly require xz, as it is used by all the tools to unpack the
+  virt-p2v binary.
 
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.42.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+* Thu Dec 05 2019 Pino Toscano <ptoscano@redhat.com> - 1:1.42.0-2
+- Adjust the version of libguestfs-bash-completion that drops the bash
+  completion scripts
 
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.42.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.42.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Nov 28 2019 Richard W.M. Jones <rjones@redhat.com> - 1:1.42.0-1
-- New upstream release 1.42.0.
-- Use gpgverify macro instead of explicit gpgv2 command.
-- Move .sig file to sources instead of dist-git.
-
-* Tue Sep 10 2019 Pino Toscano <ptoscano@redhat.com> - 1:1.41.0-1
+* Thu Nov 28 2019 Pino Toscano <ptoscano@redhat.com> - 1:1.42.0-1
 - Initial build, split off src:libguestfs.