- replaced with maintained alternative

Changed files:
    cpuid-Makefile.patch -> 1.2
    cpuid.spec -> 1.13

diff --git a/cpuid-Makefile.patch b/cpuid-Makefile.patch
deleted file mode 100644 (file)
index 872ca08..0000000
--- a/cpuid-Makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cpuid-3.3.orig/Makefile    2006-07-09 00:59:56.000000000 +0200
-+++ cpuid-3.3/Makefile 2006-07-09 01:00:03.000000000 +0200
-@@ -1,7 +1,7 @@
- CFLAGS=-O2 -Wall
- 
- cpuid: cpuid.o
--      gcc -o $@ $^
-+      $(CC) -o $@ $^
- 
- clean:
-       rm -f *.o cpuid

diff --git a/cpuid.spec b/cpuid.spec
index d47082ec3ca27af5584f553d8fe67b6c26e0bdfe..fb2290a25a7e9cfeeef217818eaf8cc8ed44d6f9 100644 (file)
--- a/cpuid.spec
+++ b/cpuid.spec
@@ -1,14 +1,13 @@
 Summary:       x86 CPUID display program
 Summary(pl.UTF-8):     CPUID dla procesorów x86
 Name:          cpuid
-Version:       3.3
-Release:       3
-License:       GPL
+Version:       20110305
+Release:       1
+License:       GPL v2
 Group:         Applications/System
-Source0:       http://www.ka9q.net/code/cpuid/%{name}-%{version}.tar.gz
-# Source0-md5: 641af7bb12e1feb0b0d97ed68908297c
-URL:           http://www.ka9q.net/code/cpuid/
-Patch0:                %{name}-Makefile.patch
+Source0:       http://www.etallen.com/cpuid/%{name}-%{version}.src.tar.gz
+# Source0-md5: c13317518ce5d9ddba07eff9ead8080c
+URL:           http://www.etallen.com/cpuid.html
 ExclusiveArch: %{ix86} %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -21,7 +20,6 @@ procesora (x86).
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__make} \
@@ -30,13 +28,16 @@ procesora (x86).
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sbindir}
+install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man1}
 
-install cpuid $RPM_BUILD_ROOT%{_sbindir}
+install %{name} $RPM_BUILD_ROOT%{_sbindir}
+cp -a %{name}.man $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc ChangeLog FUTURE
 %attr(755,root,root) %{_sbindir}/*
+%{_mandir}/man1/%{name}.1*