- added x32 patch, build on x32 too; release 2

diff --git a/cpuid-x32.patch b/cpuid-x32.patch
new file mode 100644 (file)
index 0000000..0962555
--- /dev/null
+++ b/cpuid-x32.patch
@@ -0,0 +1,11 @@
+--- 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 4aef98fe07170dbac70b5dab3fc887bd585ac392..dcd985a815c655544564cd767b58bae9933e6c6c 100644 (file)
--- a/cpuid.spec
+++ b/cpuid.spec
@@ -2,13 +2,14 @@ Summary:      x86 CPUID information display program
 Summary(pl.UTF-8):     Program wyświetlający informacje CPUID dla procesorów x86
 Name:          cpuid
 Version:       20150606
-Release:       1
+Release:       2
 License:       GPL v2+
 Group:         Applications/System
 Source0:       http://www.etallen.com/cpuid/%{name}-%{version}.src.tar.gz
 # Source0-md5: 9df0752a2e3bb40ab4db694f6fa7add9
+Patch0:                %{name}-x32.patch
 URL:           http://www.etallen.com/cpuid.html
-ExclusiveArch: %{ix86} %{x8664}
+ExclusiveArch: %{ix86} %{x8664} x32
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -21,6 +22,7 @@ procesora (lub procesorów) x86 zebrane przy użyciu instrukcji CPUID.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__make} \