diff --git a/.gitignore b/.gitignore index cee61d8..0e4e29b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ -/virt-p2v-1.41.0.tar.gz -/virt-p2v-1.42.0.tar.gz -/virt-p2v-1.42.0.tar.gz.sig +/virt-p2v-*.tar.gz +/virt-p2v-*.tar.gz.sig diff --git a/sources b/sources index b88ac9a..05624c5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-p2v-1.42.0.tar.gz) = 215906997bd63fe9c76c599036ca204078ce4f059f87a4f1f1422d9f844156790eafa7654692776d4e5ba9936edb1042b485b300baa1bbc2a8ecb645bae04b80 -SHA512 (virt-p2v-1.42.0.tar.gz.sig) = cc1047fa1ce53ee4d997cc9eae66fdabb66ba6414392ac585ea794547e76e88b245484e5b452a899f26483d6bfcfa7a71bb9c9e4e676d1914708508bb811d6f4 +SHA512 (virt-p2v-1.42.1.tar.gz) = df8d66bc437a9ea6e0b3cf569c29cf07ca56a719e6476d555ef9c73a48e4606960d22099f484961e3619f3a7564cdddd237de33cfe5ce143c1f4bef8edf2aba1 +SHA512 (virt-p2v-1.42.1.tar.gz.sig) = 3b31205dcb0cff1b0bc199329457dc5fc055e0cdef7351f3b43257311070ef725905485eff9b9085d75abf4ab8a8ed8c255af799f690f058422438074b124b7c diff --git a/virt-p2v.spec b/virt-p2v.spec index cadd348..f665ab6 100644 --- a/virt-p2v.spec +++ b/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 -Release: 6%{?dist} +Version: 1.42.1 +Release: 1%{?dist} License: GPLv2+ # virt-p2v works only on x86_64 at the moment. It requires porting @@ -51,10 +51,6 @@ BuildRequires: gnupg2 # Test suite requirements. BuildRequires: /usr/bin/qemu-nbd -# https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries#Packages_granted_exceptions -Provides: bundled(gnulib) - - Requires: gawk Requires: gzip @@ -89,20 +85,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 -%autopatch -p1 +%autosetup -p1 %build %configure \ - --with-extra="fedora=%{fedora},release=%{release}" \ - --disable-gnulib-tests + --with-extra="fedora=%{fedora},release=%{release}" -make V=1 %{?_smp_mflags} +%make_build %check - if ! make check; then cat test-suite.log exit 1 @@ -110,13 +103,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 +127,11 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/p2v-release-notes.1* %changelog +* Tue May 10 2022 Richard W.M. Jones - 1:1.42.1-1 +- New upstream release 1.42.1 +- gnulib removed upstream. +- Some specfile modernization. + * Sat Jan 22 2022 Fedora Release Engineering - 1:1.42.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild