SPECS: kernel-desktop.spec - -mcpu=440 patch, fix reiser4 bcond

[glen]

Author: glen                         Date: Thu Apr 10 20:18:11 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- -mcpu=440 patch, fix reiser4 bcond

---- Files affected:
SPECS:
   kernel-desktop.spec (1.183 -> 1.184) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.183 SPECS/kernel-desktop.spec:1.184
--- SPECS/kernel-desktop.spec:1.183	Thu Apr 10 22:14:41 2008
+++ SPECS/kernel-desktop.spec	Thu Apr 10 22:18:06 2008
@@ -219,6 +219,7 @@
 Patch85:	%{pname}-cpuset_virtualization.patch
 
 ### Fixes
+Patch90:	kernel-mcpu=440.patch
 Patch91:	%{pname}-fbcon-margins.patch
 Patch92:	%{pname}-static-dev.patch
 Patch100:	%{pname}-small_fixes.patch
@@ -262,7 +263,7 @@
 Conflicts:	ppp < 1:2.4.0
 Conflicts:	procps < 3.2.0
 Conflicts:	quota-tools < 3.09
-%if %{with reiserfs4}
+%if %{with reiser4}
 Conflicts:	reiser4progs < 1.0.0
 %endif
 Conflicts:	reiserfsprogs < 3.6.3
@@ -296,7 +297,7 @@
 %define		kernel_release %{version}_%{alt_kernel}-%{_localversion}
 %define		_kernelsrcdir	/usr/src/linux-%{version}_%{alt_kernel}
 
-%define	CommonOpts	HOSTCC="%{kgcc}" HOSTCFLAGS="-Wall -Wstrict-prototypes %{rpmcflags} -fomit-frame-pointer"
+%define		CommonOpts	HOSTCC="%{kgcc}" HOSTCFLAGS="-Wall -Wstrict-prototypes %{rpmcflags} -fomit-frame-pointer"
 %if "%{_target_base_arch}" != "%{_arch}"
 	%define	MakeOpts %{CommonOpts} ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux-
 	%define	DepMod /bin/true
@@ -680,6 +681,7 @@
 %patch77 -p1
 
 ### fixes
+%patch90 -p1
 %patch91 -p1
 %patch92 -p1
 %patch100 -p1
@@ -1153,6 +1155,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.184  2008-04-10 20:18:06  glen
+- -mcpu=440 patch, fix reiser4 bcond
+
 Revision 1.183  2008-04-10 20:14:41  glen
 - kgcc/kgcc_package instead of gcc4 bcond
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-desktop.spec?r1=1.183&r2=1.184&f=u