rpms/x86info/devel x86info-1.24-make-j.patch, NONE, 1.1 x86info.spec, 1.41, 1.42

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/x86info/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6854

Modified Files:
	x86info.spec 
Added Files:
	x86info-1.24-make-j.patch 
Log Message:
* Tue Jul 14 2009 Adam Jackson <ajax at redhat.com>
- Fix parallel build.


x86info-1.24-make-j.patch:

--- NEW FILE x86info-1.24-make-j.patch ---
diff -up x86info-1.24/Makefile.jx x86info-1.24/Makefile
--- x86info-1.24/Makefile.jx	2009-02-06 12:10:58.000000000 -0500
+++ x86info-1.24/Makefile	2009-07-14 09:43:52.000000000 -0400
@@ -30,6 +30,8 @@ LSMSR_SRC =\
 
 LSMSR_OBJS = $(LSMSR_SRC:%.c=%.o)
 
+lsmsr.c: $(LSMSR_TMP_HEADERS)
+
 lsmsr: $(LSMSR_TMP_HEADERS) $(LSMSR_OBJS)
 	$(CC) $(CFLAGS) -o lsmsr $(LSMSR_OBJS)
 


Index: x86info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/x86info/devel/x86info.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- x86info.spec	26 Feb 2009 07:34:13 -0000	1.41
+++ x86info.spec	14 Jul 2009 13:47:08 -0000	1.42
@@ -1,7 +1,7 @@
 Summary:        x86 processor information tool.
 Name:           x86info
 Version:        1.24
-Release:        %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}.1
+Release:        %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
@@ -13,17 +13,18 @@ BuildRequires:	python
 
 Obsoletes:      kernel-utils
 
+Patch0:		x86info-1.24-make-j.patch
+
 %description
 x86info displays diagnostic information about x86 processors, such
 as cache configuration and supported features.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .make-j
 
 %build
-# disable %{?_smp_mflags} until I get some dependancies fixed upstream.
-# lsmsr.c tries to build before generic_msr.h is generated.
-make CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -rf %{buildroot}
@@ -46,6 +47,9 @@ rm -rf %{buildroot}
 %attr(0644,root,root) %{_mandir}/*/*
 
 %changelog
+* Tue Jul 14 2009 Adam Jackson <ajax at redhat.com>
+- Fix parallel build.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.24-1.40.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild