SPECS/virt-p2v.spec

@@ -10,7 +10,7 @@ Summary:       Convert a physical machine to run on KVM
 Name:          virt-p2v
 Epoch:         1
 Version:       1.42.0
-Release:       6%{?dist}
+Release:       5%{?dist}
 License:       GPLv2+
 
 # virt-p2v works only on x86_64 at the moment.  It requires porting
@@ -31,7 +31,6 @@ Source2:       libguestfs.keyring
 %endif
 
 # Basic build requirements.
-BuildRequires: make
 BuildRequires: gcc
 BuildRequires: perl(Pod::Simple)
 BuildRequires: perl(Pod::Man)
@@ -51,12 +50,28 @@ BuildRequires: gnupg2
 # Test suite requirements.
 BuildRequires: /usr/bin/qemu-nbd
 
+%description
+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.
+
+
+%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
@@ -65,15 +80,11 @@ Requires:      libguestfs-tools-c
 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
+Obsoletes: libguestfs-bash-completion < 1:1.38.4-15
 
 
-%description
+%description maker
 Virt-p2v converts (virtualizes) physical machines so they can be run
 as virtual machines under KVM.
 
@@ -87,7 +98,8 @@ 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
 %setup -q
 %autopatch -p1
@@ -95,7 +107,7 @@ To convert virtual machines from other hypervisors, see virt-v2v.
 
 %build
 %configure \
-  --with-extra="fedora=%{fedora},release=%{release}" \
+  --with-extra="rhel=%{rhel},release=%{release}" \
   --disable-gnulib-tests
 
 make V=1 %{?_smp_mflags}
@@ -117,42 +129,41 @@ 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
+# 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 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
-* 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 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.
 
-* 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
+* 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.
 
-* 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
+* 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 Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.42.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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
 
-* 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.