[x86info] - Merge-review cleanup (#226547)

paragn paragn at fedoraproject.org
Thu Oct 21 05:09:41 UTC 2010


commit fb9c9967bee56d7356ce2c0085fdfb603abe9c57
Author: paragn <paragn at fedoraproject.org>
Date:   Thu Oct 21 10:39:28 2010 +0530

    - Merge-review cleanup (#226547)

 x86info.spec |   27 ++++++++++++---------------
 1 files changed, 12 insertions(+), 15 deletions(-)
---
diff --git a/x86info.spec b/x86info.spec
index 7957016..84a80ce 100644
--- a/x86info.spec
+++ b/x86info.spec
@@ -1,47 +1,44 @@
 Summary:        x86 processor information tool.
 Name:           x86info
 Version:        1.27
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
 Source0:        http://www.codemonkey.org.uk/projects/x86info/x86info-%{version}.tgz
-Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 ExclusiveArch:  %{ix86} x86_64
 Url:            http://www.codemonkey.org.uk/projects/x86info
-BuildRequires:  python
+BuildRequires:  python2-devel
 
 %description
 x86info displays diagnostic information about x86 processors, such
 as cache configuration and supported features.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 
 %install
-rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_sbindir}
-mkdir -p %{buildroot}/usr/share/man/man{1,8}
+mkdir -p %{buildroot}%{_mandir}/man{1,8}
 
-install x86info %{buildroot}%{_sbindir}/x86info
-install x86info.1 %{buildroot}/usr/share/man/man1/
-install lsmsr %{buildroot}%{_sbindir}/lsmsr
+install -p -m 0755 x86info %{buildroot}%{_sbindir}/x86info
+install -p -m 0644 x86info.1 %{buildroot}%{_mandir}/man1/
+install -p -m 0755 lsmsr %{buildroot}%{_sbindir}/lsmsr
 
-chmod -R a-s %{buildroot}
-
-%clean
-rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_sbindir}/x86info
 %{_sbindir}/lsmsr
-%attr(0644,root,root) %{_mandir}/*/*
+%{_mandir}/man1/*
 
 %changelog
+* Sat Oct 02 2010 Parag Nemade <paragn AT fedoraproject.org> - 1.27-2
+- Merge-review cleanup (#226547)
+
 * Wed Sep 08 2010 Dave Jones <davej at redhat.com>
 - Update to new upstream 1.27 (fixes build problem in 1.26)
 


More information about the scm-commits mailing list