- nopae kernel doesn't make sense on i486 and i586

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index 930f0b09c99cb43e17f704c8ce3e5248a7c12047..3762ba4884fdb4ea8f7d7cfbf50e8f20c0a3196e 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -70,7 +70,7 @@
 
 %define                rel             1
 %define                basever         3.18
-%define                postver         .4
+%define                postver         .5
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       %{nil}
@@ -94,6 +94,9 @@
 %if %{with vanilla}
 %define                alt_kernel      vanilla
 %endif
+%if %{without pae}
+%define                alt_kernel      nopae
+%endif
 
 # kernel release (used in filesystem and eventually in uname -r)
 # modules will be looked from /lib/modules/%{kernel_release}
@@ -116,7 +119,7 @@ Source0:    http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
 # Source0-md5: 9e854df51ca3fef8bfe566dbd7b89241
 %if "%{postver}" != ".0"
 Patch0:                http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
-# Patch0-md5:  e7c510c0df50abb2cbaea2a1a87f35b7
+# Patch0-md5:  e8563b2feaa6c33d20d23ac7add9d385
 %endif
 Source1:       kernel.sysconfig
 
@@ -308,7 +311,11 @@ Conflicts: udev < 1:081
 Conflicts:     util-linux < 2.10o
 Conflicts:     util-vserver < 0.30.216
 Conflicts:     xfsprogs < 2.6.0
+%if %{without pae}
+ExclusiveArch: i686 pentium3 pentium4 athlon
+%else
 ExclusiveArch: i486 i586 i686 pentium3 pentium4 athlon %{x8664} x32 alpha arm ia64 ppc ppc64 sparc sparc64
+%endif
 ExclusiveOS:   Linux
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)