From aa0cdeafb9ad8f1098f9ddaadace3c0609bc590d Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 13 Apr 2021 11:06:14 +0100
Subject: [PATCH] Update to latest version from Fedora resolves: rhbz#1950633

Add all patches since 1.20 in preparation for 1.21 release.

(cherry picked from commit 34d5e2a28233c69f4e60320b9f024dee67b5ba10)

Always rebuild upstream autotools files.

(cherry picked from commit fdac88bb69c4db5cc0df057a8929252937cfc124)

New upstream version 1.21.

(cherry picked from commit 8f53b993c1495460a5ae55d284bb536fd3bb4188)
---
 .gitignore     |  1 +
 sources        |  3 ++-
 virt-what.spec | 16 ++++++++++++----
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5f64095..6fc170f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /virt-what-*.tar.gz
+/virt-what-1.21.tar.gz.sig
diff --git a/sources b/sources
index 1e18e3b..6989970 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (virt-what-1.20.tar.gz) = edf74903122bfb422c7a5ecba711bb64d6ef668828f208dfc0571ef14f2643456c14bc9a77dfea209df3d93869ac0a2c9fd039779922eddc6ebd9d988585dea4
+SHA512 (virt-what-1.21.tar.gz) = 14ace184c4aee5a09b855c1f5acaa619057aed1b9bf03c91ed1003e6a39ea69162c9fe452ea8162c7fe29825e0e2202cfc7d76e82f0cecea3e32405e5eb9f717
+SHA512 (virt-what-1.21.tar.gz.sig) = f07368ab53ecf221e57f924f78e56d6fb56823522f62aea1ff107c1649f31964ad661e79c450487067de1f40436e5b5b7c3b5a1fd1cc7233c2d201ab5e594bf3
diff --git a/virt-what.spec b/virt-what.spec
index f10fe2d..04043ac 100644
--- a/virt-what.spec
+++ b/virt-what.spec
@@ -1,14 +1,15 @@
 Name:           virt-what
-Version:        1.20
-Release:        6%{?dist}
+Version:        1.21
+Release:        1%{?dist}
 Summary:        Detect if we are running in a virtual machine
 License:        GPLv2+
 
 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
 
-BuildRequires: make
+BuildRequires:  make
 BuildRequires:  git
+BuildRequires:  autoconf, automake, libtool
 
 # This is provided by the build root, but we make it explicit
 # anyway in case this was dropped from the build root in future.
@@ -60,6 +61,7 @@ Current types of virtualization detected:
  - lxc          Linux LXC container
  - kvm          Linux Kernel Virtual Machine (KVM)
  - lkvm         LKVM / kvmtool
+ - nutanix_ahv  Nutanix Acropolis Hypervisor (AHV)
  - openvz       OpenVZ or Virtuozzo
  - ovirt        oVirt node
  - parallels    Parallels Virtual Platform
@@ -81,6 +83,9 @@ Current types of virtualization detected:
 %prep
 %autosetup -S git
 
+# Always rebuild upstream autotools files.
+autoreconf -i
+
 
 %build
 %configure
@@ -105,6 +110,9 @@ fi
 
 
 %changelog
+* Mon Apr 19 2021 Richard W.M. Jones <rjones@redhat.com> - 1.21-1
+- New upstream version 1.21.
+
 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.20-6
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937