rpms/kernel/devel kernel.spec,1.1267,1.1268

[Jarod Wilson]

Author: jwilson

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

Modified Files:
	kernel.spec 
Log Message:
make baseonly -> PAE actually work on i686


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1267
retrieving revision 1.1268
diff -u -r1.1267 -r1.1268
--- kernel.spec	5 Feb 2009 21:15:28 -0000	1.1267
+++ kernel.spec	5 Feb 2009 21:28:22 -0000	1.1268
@@ -191,14 +191,13 @@
 %ifarch i686
 %define with_up 0
 %define with_pae 1
+%else
+%define with_pae 0
 %endif
 
 # if requested, only build base kernel
 %if %{with_baseonly}
 %define with_smp 0
-%ifnarch i686
-%define with_pae 0
-%endif
 %define with_kdump 0
 %define with_debug 0
 %endif
@@ -206,7 +205,6 @@
 # if requested, only build smp kernel
 %if %{with_smponly}
 %define with_up 0
-%define with_pae 0
 %define with_kdump 0
 %define with_debug 0
 %endif
@@ -379,7 +377,7 @@
 %endif
 
 %define with_pae_debug 0
-%if %with_pae
+%if %{with_pae}
 %define with_pae_debug %{with_debug}
 %endif
 
@@ -856,7 +854,7 @@
 %prep
 # do a few sanity-checks for --with *only builds
 %if %{with_baseonly}
-%if !%{with_up}
+%if !%{with_up}%{with_pae}
 echo "Cannot build --with baseonly, up build is disabled"
 exit 1
 %endif