From 246fbdeb9a6574c614b4f07ee5c21237df42b779 Mon Sep 17 00:00:00 2001 From: Andrzej Zawadzki Date: Fri, 17 Feb 2017 10:42:05 +0100 Subject: [PATCH] - up to 20170122 - remove obsolete patch --- cpuid-x32.patch | 11 ----------- cpuid.spec | 6 ++---- 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 cpuid-x32.patch diff --git a/cpuid-x32.patch b/cpuid-x32.patch deleted file mode 100644 index 0962555..0000000 --- a/cpuid-x32.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cpuid-20150606/cpuid.c.orig 2015-06-07 02:03:14.000000000 +0200 -+++ cpuid-20150606/cpuid.c 2015-06-26 23:16:36.966332168 +0200 -@@ -3367,7 +3367,7 @@ - static int bits_needed(unsigned long v) - { - int result; --#ifdef __x86_64 -+#if defined(__x86_64) && !defined(__ILP32__) - asm("movq %[v],%%rax;" - "movq $0,%%rcx;" - "movl $0,%[result];" diff --git a/cpuid.spec b/cpuid.spec index c8c586e..7dd7136 100644 --- a/cpuid.spec +++ b/cpuid.spec @@ -1,13 +1,12 @@ Summary: x86 CPUID information display program Summary(pl.UTF-8): Program wyświetlający informacje CPUID dla procesorów x86 Name: cpuid -Version: 20151017 +Version: 20170122 Release: 1 License: GPL v2+ Group: Applications/System Source0: http://www.etallen.com/cpuid/%{name}-%{version}.src.tar.gz -# Source0-md5: 445f4674f0ca7fe10d0a24e0bd34d40d -Patch0: %{name}-x32.patch +# Source0-md5: 1c46a6662626c5a6eaca626f23a5a7d7 URL: http://www.etallen.com/cpuid.html ExclusiveArch: %{ix86} %{x8664} x32 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -22,7 +21,6 @@ procesora (lub procesorów) x86 zebrane przy użyciu instrukcji CPUID. %prep %setup -q -%patch0 -p1 %build %{__make} \ -- 2.44.0