From 686a2a28c6ae35d7c44173cdb82ab4e2f08ab4cf Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 01 2017 02:43:29 +0000 Subject: import cpuid-20170122-6.el7 --- diff --git a/.cpuid.metadata b/.cpuid.metadata index ba61de5..d115977 100644 --- a/.cpuid.metadata +++ b/.cpuid.metadata @@ -1 +1 @@ -821a43a2e7f6376c1f8e3f1886e53c8d7f8d4079 SOURCES/cpuid-20151017.src.tar.gz +a3060b988cb37bdc079ab6e2fdde191f657822c2 SOURCES/cpuid-20170122.src.tar.gz diff --git a/.gitignore b/.gitignore index 8068f46..81aefb6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/cpuid-20151017.src.tar.gz +SOURCES/cpuid-20170122.src.tar.gz diff --git a/SOURCES/disclaimer.patch b/SOURCES/disclaimer.patch index 7d7f0b6..b8a4eee 100644 --- a/SOURCES/disclaimer.patch +++ b/SOURCES/disclaimer.patch @@ -1,13 +1,13 @@ -diff -crB cpuid-20151017-orig/cpuid.c cpuid-20151017-new/cpuid.c -*** cpuid-20151017-orig/cpuid.c 2015-10-17 21:59:03.000000000 +0200 ---- cpuid-20151017-new/cpuid.c 2016-06-01 18:31:23.531378179 +0200 +diff -crB cpuid-20170122-orig/cpuid.c cpuid-20170122-new/cpuid.c +*** cpuid-20170122-orig/cpuid.c 2017-01-24 09:13:20.995887582 -0500 +--- cpuid-20170122-new/cpuid.c 2017-01-24 09:13:54.610751021 -0500 *************** -*** 6926,6931 **** ---- 6926,6932 ---- +*** 7302,7307 **** +--- 7302,7308 ---- if (opt_version) { printf("cpuid version %s\n", XSTR(VERSION)); } else { + fprintf(stderr, "Disclaimer: %s may not support decoding of all cpuid registers.\n", program); if (opt_filename != NULL) { do_file(opt_filename, opt_raw, opt_debug); - } else { + } else if (opt_leaf) { diff --git a/SPECS/cpuid.spec b/SPECS/cpuid.spec index 0acf130..ce04d71 100644 --- a/SPECS/cpuid.spec +++ b/SPECS/cpuid.spec @@ -1,6 +1,6 @@ Name: cpuid -Version: 20151017 -Release: 4%{?dist} +Version: 20170122 +Release: 6%{?dist} Summary: Dumps information about the CPU(s) License: GPLv2+ @@ -8,7 +8,6 @@ URL: http://www.etallen.com/cpuid.html Source0: http://www.etallen.com/%{name}/%{name}-%{version}.src.tar.gz # Specific to RHEL Patch1: disclaimer.patch - ExclusiveArch: %{ix86} x86_64 %description @@ -35,6 +34,12 @@ install -Dp -m 0644 %{name}.man.gz %{buildroot}%{_mandir}/man1/%{name}.1.gz %{_bindir}/%{name} %changelog +* Tue Jan 24 2017 David Arcari - 20170122-6 +- Update to new upstream version 20170122 (rhbz#1381311) + +* Tue Nov 22 2016 David Arcari - 20161114-5 +- Update to new upstream version 20161114 (rhbz#1381311) + * Wed Jun 22 2016 Jirka Hladky - 20151017-4 - Fixed license field