Rebase to Fedora Rawhide

resolves: RHEL-56808
This commit is contained in:
Richard W.M. Jones 2024-09-09 10:52:49 +01:00
parent e934804be1
commit 49c032b798
3 changed files with 17 additions and 13 deletions

BIN
libguestfs.keyring Normal file

Binary file not shown.

View File

@ -1,2 +1,2 @@
SHA512 (virt-what-1.26.tar.gz) = 1939e0f9c2ab9a17feb9f737e0823eb2f2950838e0724fb87119823213c1defc9c7229ed703e977540d6bfe0d681230e4131b4fcfe4db4864b784cba69254ee0 SHA512 (virt-what-1.27.tar.gz) = 8d10111e38a87504daccf36e9386863aa92308c96be65164412d92c56c12d42f38e6e251fabe7945ce74e1419fc82c0ac3cdbd0f25b19cd72feda2e199307d6f
SHA512 (virt-what-1.26.tar.gz.sig) = 25d691a7a4d90aa3347c44ba835db5deaf13e891675a26ed44114bdc62dbe161663db2924622d1633f9821623ddb9e14288183d1b17677510c7210e9b4e3b3b7 SHA512 (virt-what-1.27.tar.gz.sig) = d3b189ba579388082f489219f1051841b888188f865d4718a49da0d85fde64c5d6ca5fa44dd33ef782f2d615444a6d942241a6de5722360f724344320acf1370

View File

@ -1,22 +1,18 @@
Name: virt-what Name: virt-what
Version: 1.26 Version: 1.27
Release: 3%{?dist} Release: 1%{?dist}
Summary: Detect if we are running in a virtual machine Summary: Detect if we are running in a virtual machine
License: GPL-2.0-or-later License: GPL-2.0-or-later
URL: http://people.redhat.com/~rjones/virt-what/ URL: http://people.redhat.com/~rjones/virt-what/
Source0: http://people.redhat.com/~rjones/virt-what/files/%{name}-%{version}.tar.gz Source0: http://people.redhat.com/~rjones/virt-what/files/%{name}-%{version}.tar.gz
Source1: http://people.redhat.com/~rjones/virt-what/files/%{name}-%{version}.tar.gz.sig
# Keyring used to verify tarball signature.
Source2: libguestfs.keyring
# Maintainer script which helps with handling patches. # Maintainer script which helps with handling patches.
Source1: copy-patches.sh Source3: copy-patches.sh
# Patches are maintained in the following repository:
# http://git.annexia.org/?p=virt-what.git;a=shortlog;h=refs/heads/rhel-10.0
# Patches.
Patch0001: 0001-Fix-CVM-detection-on-Azure-with-TDX.patch
Patch0002: 0002-Add-support-for-detecting-protected-virtualization-o.patch
Patch0003: 0003-virt-what-cvm.pod-Fix-man-page-typo-s390x-protvirt-s.patch
BuildRequires: gcc BuildRequires: gcc
BuildRequires: make BuildRequires: make
@ -24,6 +20,9 @@ BuildRequires: git
BuildRequires: autoconf, automake, libtool BuildRequires: autoconf, automake, libtool
BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2man
# Required to verify tarball signature.
BuildRequires: gnupg2
# Required at build time in order to do 'make check' (for getopt). # Required at build time in order to do 'make check' (for getopt).
BuildRequires: util-linux BuildRequires: util-linux
@ -91,6 +90,7 @@ Current types of virtualization detected:
%prep %prep
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
%autosetup -S git %autosetup -S git
# Always rebuild upstream autotools files. # Always rebuild upstream autotools files.
@ -121,6 +121,10 @@ fi
%changelog %changelog
* Mon Sep 09 2024 Richard W.M. Jones <rjones@redhat.com> - 1.27-1
- Rebase to Fedora Rawhide
resolves: RHEL-56808
* Tue Aug 13 2024 Richard W.M. Jones <rjones@redhat.com> - 1.26-3 * Tue Aug 13 2024 Richard W.M. Jones <rjones@redhat.com> - 1.26-3
- Backport CVM fixes from upstream - Backport CVM fixes from upstream
resolves: RHEL-54092 resolves: RHEL-54092