From 77d8b3849e426cc4cc9cc82f670841a7ea026f42e5cb44495ac5029972edee14 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 15 Nov 2021 22:43:17 +0000
Subject: [PATCH 1/2] Accepting request 931629 from
 home:AndreasStieger:branches:utilities

cpuid 20211114

OBS-URL: https://build.opensuse.org/request/show/931629
OBS-URL: https://build.opensuse.org/package/show/utilities/cpuid?expand=0&rev=32
---
 cpuid-20201006.src.tar.gz |  3 ---
 cpuid-20211114.src.tar.gz |  3 +++
 cpuid.changes             |  7 +++++++
 cpuid.spec                | 20 ++++++++++----------
 4 files changed, 20 insertions(+), 13 deletions(-)
 delete mode 100644 cpuid-20201006.src.tar.gz
 create mode 100644 cpuid-20211114.src.tar.gz

diff --git a/cpuid-20201006.src.tar.gz b/cpuid-20201006.src.tar.gz
deleted file mode 100644
index 85cb8b3..0000000
--- a/cpuid-20201006.src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:13c53f16408341d11ed489b352f218ec4dbb5bedb796a9d059e924770a9c56a6
-size 118994
diff --git a/cpuid-20211114.src.tar.gz b/cpuid-20211114.src.tar.gz
new file mode 100644
index 0000000..6dd626c
--- /dev/null
+++ b/cpuid-20211114.src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7107dc8cc68f3fb3613244e44af7b4c91fa6cd14aec373e0c2e743545203e1b7
+size 126084
diff --git a/cpuid.changes b/cpuid.changes
index 3bed0b0..4a25034 100644
--- a/cpuid.changes
+++ b/cpuid.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Nov 15 22:04:30 UTC 2021 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- update to 20211114:
+  * Many updated and added identified CPU models and variants
+  * Updated hypervisor support
+
 -------------------------------------------------------------------
 Thu Oct  8 08:19:24 UTC 2020 - Josef Möllers <josef.moellers@suse.com>
 
diff --git a/cpuid.spec b/cpuid.spec
index 7a7e9f8..9b36e82 100644
--- a/cpuid.spec
+++ b/cpuid.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cpuid
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,17 +17,17 @@
 
 
 Name:           cpuid
-Version:        20201006
+Version:        20211114
 Release:        0
 Summary:        x86 CPU identification tool
 License:        GPL-2.0-or-later
 Group:          System/Management
 URL:            http://etallen.com/cpuid.html
-Source:         http://etallen.com/cpuid/%name-%version.src.tar.gz
+Source:         http://etallen.com/cpuid/%{name}-%{version}.src.tar.gz
 BuildRequires:  gcc
 BuildRequires:  glibc-devel
 BuildRequires:  make
-ExclusiveArch:  %ix86 x86_64
+ExclusiveArch:  %{ix86} x86_64
 
 %description
 cpuid executes the CPUID instruction on x86-family CPUs and decodes
@@ -40,18 +40,18 @@ Cyrix CPUs, and is fairly complete.
 %build
 # remove -Werror=format-security which is used on Mandriva, as it produces
 # a false positive compiler error on several printf calls:
-CFLAGS=$(echo "%optflags -Wall" | sed 's/-Werror=format-security//g')
+CFLAGS=$(echo "%{optflags} -Wall" | sed 's/-Werror=format-security//g')
 %make_build CFLAGS="$CFLAGS"
 
 %install
-mkdir -p "%buildroot/%_bindir" "%buildroot/%_mandir/man1"
-install -pm0755 cpuid cpuinfo2cpuid "%buildroot/%_bindir/"
-install -pm0644 cpuid.man "%buildroot/%_mandir/man1/cpuid.1"
+mkdir -p "%{buildroot}/%{_bindir}" "%{buildroot}/%{_mandir}/man1"
+install -pm0755 cpuid cpuinfo2cpuid "%{buildroot}/%{_bindir}/"
+install -pm0644 cpuid.man "%{buildroot}/%{_mandir}/man1/cpuid.1"
 
 %files
 %doc ChangeLog
 %license LICENSE
-%_bindir/cpu*
-%_mandir/man1/cpuid.1*
+%{_bindir}/*
+%{_mandir}/man1/*.1%{?ext_man}
 
 %changelog

From 851f9cbc780b24930ec9224befdc3010dfc65d9cb1f5bab100d2a7c3b9f2334e Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 15 Nov 2021 22:43:30 +0000
Subject: [PATCH 2/2] OBS-URL:
 https://build.opensuse.org/package/show/utilities/cpuid?expand=0&rev=33

---
 cpuid.spec | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/cpuid.spec b/cpuid.spec
index 9b36e82..a70bdfb 100644
--- a/cpuid.spec
+++ b/cpuid.spec
@@ -23,11 +23,11 @@ Summary:        x86 CPU identification tool
 License:        GPL-2.0-or-later
 Group:          System/Management
 URL:            http://etallen.com/cpuid.html
-Source:         http://etallen.com/cpuid/%{name}-%{version}.src.tar.gz
+Source:         http://etallen.com/cpuid/%name-%version.src.tar.gz
 BuildRequires:  gcc
 BuildRequires:  glibc-devel
 BuildRequires:  make
-ExclusiveArch:  %{ix86} x86_64
+ExclusiveArch:  %ix86 x86_64
 
 %description
 cpuid executes the CPUID instruction on x86-family CPUs and decodes
@@ -40,18 +40,18 @@ Cyrix CPUs, and is fairly complete.
 %build
 # remove -Werror=format-security which is used on Mandriva, as it produces
 # a false positive compiler error on several printf calls:
-CFLAGS=$(echo "%{optflags} -Wall" | sed 's/-Werror=format-security//g')
+CFLAGS=$(echo "%optflags -Wall" | sed 's/-Werror=format-security//g')
 %make_build CFLAGS="$CFLAGS"
 
 %install
-mkdir -p "%{buildroot}/%{_bindir}" "%{buildroot}/%{_mandir}/man1"
-install -pm0755 cpuid cpuinfo2cpuid "%{buildroot}/%{_bindir}/"
-install -pm0644 cpuid.man "%{buildroot}/%{_mandir}/man1/cpuid.1"
+mkdir -p "%buildroot/%_bindir" "%buildroot/%_mandir/man1"
+install -pm0755 cpuid cpuinfo2cpuid "%buildroot/%_bindir/"
+install -pm0644 cpuid.man "%buildroot/%_mandir/man1/cpuid.1"
 
 %files
 %doc ChangeLog
 %license LICENSE
-%{_bindir}/*
-%{_mandir}/man1/*.1%{?ext_man}
+%_bindir/*
+%_mandir/man1/*.1%{?ext_man}
 
 %changelog