Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade: virt-p2v version to 1.42.4 #12272

Open
wants to merge 2 commits into
base: 3.0-dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added SPECS-EXTENDED/virt-p2v/libguestfs.keyring
Binary file not shown.
17 changes: 17 additions & 0 deletions SPECS-EXTENDED/virt-p2v/virt-p2v-1.42.4.tar.gz.sig
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----

iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmcp+1MRHHJpY2hAYW5u
ZXhpYS5vcmcACgkQkXOPc+G3aKDukBAAp8bca3qdFPIBqnxrCuFnZJYkrugTKbvV
5dakRj1dVNr1aX3DnvgBVhKmJyp2r0WpvvCkCBoZqiJsYI3Y9FvCRP36l47FB2zC
Vn0P3eItCfqiheuFuwU6f7uDcTpHHCcsV3RWPQBZd/HOdXghZCn7KbCj+yUQiVvI
nRhpJ5yNgybDsKV41p3uXEIIwOOy6O8gQCFgV1iLmmKS0yVSIy4udLqM5KE2KuKM
nPlc5FwHl1Ou/H7INtmQ8EGpiVemyBmgkAu8JE2BJHp7JUTruAUjaHs6zmnayCrx
ojfXcxSlBBLSrKwUBW4WzhkzRqbiPJ/NFwkyTnOVhMyu0maehnaZMr7LWL57kSb7
NPNzIDL6zVaJO2CikgELSSn3jzzTntnRgHkLFgfqt54oPhp3RzT95uYqu+8sgx24
VihQWEgM+kvfgqpIuYEzrExL2bA+xdqlc2ppIx0o7l1spi1Zvh9zgG5u+7Fhx9cs
5tuIk2oKwhr6YbRkkvViJt66MKlJA1aHGrqCT34yvuBG7O3u11aP1QruN30kU2aI
CJ6bDZwz6InQ2+mbxH+te6PgDcFLtXMhCFp8UcNNtvy/ddxfRniOLUzYSMC2uhpd
uTakFDG4q8rQtc6rwC6jewxEV2eNmyKKnEU1P5pmLrV/wUqwH/QGH7prm+Mpz+vX
2NKaPyyZS74=
=/YcD
-----END PGP SIGNATURE-----
6 changes: 4 additions & 2 deletions SPECS-EXTENDED/virt-p2v/virt-p2v.signatures.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"Signatures": {
"virt-p2v-1.42.0.tar.gz": "b1164bde6658646f11e8ff0da36fe5acbedde3445cc8424110c08fc144564e20"
"libguestfs.keyring": "de74373a15bd572ad74f276ee063d2cefa915470863829c0dda6af488d6315d8",
"virt-p2v-1.42.4.tar.gz": "20ff7bec5ed630ae1928da026e6e6e471e8eb1869222762fd9ab4681975b98c5",
"virt-p2v-1.42.4.tar.gz.sig": "0c16c68cb98f14041087bbd8aa7d42ef40f81144d6877123099b30f5ca9cd776"
}
}
}
110 changes: 74 additions & 36 deletions SPECS-EXTENDED/virt-p2v/virt-p2v.spec
Original file line number Diff line number Diff line change
Expand Up @@ -8,58 +8,51 @@ Distribution: Azure Linux

Summary: Convert a physical machine to run on KVM
Name: virt-p2v
Version: 1.42.0
Release: 6%{?dist}
License: GPLv2+ and LGPLv2+
Version: 1.42.4
Release: 2%{?dist}
License: GPL-2.0-or-later AND LGPL-2.0-or-later

# virt-p2v works only on x86_64 at the moment. It requires porting
# to properly detect the hardware on other architectures, and furthermore
# virt-v2v requires porting too.
ExclusiveArch: x86_64

# Source and patches.
URL: http://libguestfs.org/
Source0: http://download.libguestfs.org/%{name}/%{name}-%{version}.tar.gz
URL: https://libguestfs.org/
Source0: https://download.libguestfs.org/%{name}/%{name}-%{version}.tar.gz
Source1: https://download.libguestfs.org/%{name}/%{name}-%{version}.tar.gz.sig

Source2: libguestfs.keyring

# 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: pcre-devel
BuildRequires: bash-completion
BuildRequires: pcre2-devel
BuildRequires: bash-completion-devel
BuildRequires: xz
BuildRequires: gtk3-devel
BuildRequires: dbus-devel
BuildRequires: m4
BuildRequires: gnupg2

# Test suite requirements.
BuildRequires: /usr/bin/qemu-nbd

# https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries#Packages_granted_exceptions
Provides: bundled(gnulib)

BuildRequires: nbdkit

Requires: gawk
Requires: gzip

# virt-p2v-make-disk runs virt-builder:
Requires: libguestfs-tools-c
Requires: libguestfs

# virt-p2v-make-kickstart runs strip:
Requires: binutils


# Migrate from the old virt-p2v-maker:
Provides: virt-p2v-maker = %{version}-%{release}
Obsoletes: virt-p2v-maker < 1.41.5

# The bash completion for p2v were shipped with the others of libguestfs:
Obsoletes: libguestfs-bash-completion < 1.41.5


%description
Virt-p2v converts (virtualizes) physical machines so they can be run
as virtual machines under KVM.
Expand All @@ -73,16 +66,15 @@ To convert virtual machines from other hypervisors, see virt-v2v.


%prep
%setup -q
%autopatch -p1
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
%autosetup -p1


%build
%configure \
--with-extra="fedora=%{fedora},release=%{release}" \
--disable-gnulib-tests
--with-extra="fedora=%{fedora},release=%{release}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove references to fedora


make V=1 %{?_smp_mflags}
%make_build


%check
Expand All @@ -94,16 +86,17 @@ 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 COPYING.LIB
%license COPYING
%{_bindir}/virt-p2v-make-disk
%{_bindir}/virt-p2v-make-kickstart
%{_bindir}/virt-p2v-make-kiwi
Expand All @@ -117,18 +110,63 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/p2v-release-notes.1*


%changelog
* Tue Sep 26 2023 Pawel Winogrodzki <[email protected]> - 1.42.0-6
- Removing 'exit' calls from the '%%check' section.

* Fri Jan 21 2022 Pawel Winogrodzki <[email protected]> - 1.42.0-5
* Fri Jan 31 2025 Archana Shettigar <[email protected]> - 1.42.4-2
- Initial Azure Linux import from Fedora 41 (license: MIT).
- Remove epoch
- Removing in-spec verification of source tarballs.
- License verified.
- Removing 'exit' calls from the '%%check' section.

* Thu Oct 28 2021 Muhammad Falak <[email protected]> - 1.42.0-4
- Remove epoch
* Tue Nov 05 2024 Richard W.M. Jones <[email protected]> - 1:1.42.4-1
- New upstream version 1.42.4

* Sat Jul 20 2024 Fedora Release Engineering <[email protected]> - 1:1.42.3-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

* Mon Mar 25 2024 Richard W.M. Jones <[email protected]> - 1:1.42.3-6
- Use %%{bash_completions_dir} macro
- BR bash-completion-devel (new in Rawhide)

* Sat Jan 27 2024 Fedora Release Engineering <[email protected]> - 1:1.42.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

* Sat Jul 22 2023 Fedora Release Engineering <[email protected]> - 1:1.42.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

* Mon Jun 05 2023 Richard W.M. Jones <[email protected]> - 1:1.42.3-3
- Migrated to SPDX license

* Sat Jan 21 2023 Fedora Release Engineering <[email protected]> - 1:1.42.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

* Tue Oct 11 2022 Richard W.M. Jones <[email protected]> - 1:1.42.3-1
- New upstream release 1.42.3

* Wed Aug 03 2022 Richard W.M. Jones <[email protected]> - 1:1.42.2-1
- New upstream release 1.42.2
- 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.

* Sat Jul 23 2022 Fedora Release Engineering <[email protected]> - 1:1.42.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

* Tue May 10 2022 Richard W.M. Jones <[email protected]> - 1:1.42.1-1
- New upstream release 1.42.1
- gnulib removed upstream.
- Some specfile modernization.

* Sat Jan 22 2022 Fedora Release Engineering <[email protected]> - 1:1.42.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

* Fri Jul 23 2021 Fedora Release Engineering <[email protected]> - 1:1.42.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

* Wed Jan 27 2021 Fedora Release Engineering <[email protected]> - 1:1.42.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

* Fri Oct 15 2021 Pawel Winogrodzki <[email protected]> - 1:1.42.0-3
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
* Wed Jul 29 2020 Fedora Release Engineering <[email protected]> - 1:1.42.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

* Fri Jan 31 2020 Fedora Release Engineering <[email protected]> - 1:1.42.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Expand Down
4 changes: 2 additions & 2 deletions cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -29566,8 +29566,8 @@
"type": "other",
"other": {
"name": "virt-p2v",
"version": "1.42.0",
"downloadUrl": "http://download.libguestfs.org/virt-p2v/virt-p2v-1.42.0.tar.gz"
"version": "1.42.4",
"downloadUrl": "http://download.libguestfs.org/virt-p2v/virt-p2v-1.42.4.tar.gz"
}
}
},
Expand Down
Loading