packages: kernel/kernel.spec - vanilla bcond fixes

[sparky]

Author: sparky                       Date: Sun May  1 15:22:14 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- vanilla bcond fixes

---- Files affected:
packages/kernel:
   kernel.spec (1.911 -> 1.912) 

---- Diffs:

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.911 packages/kernel/kernel.spec:1.912
--- packages/kernel/kernel.spec:1.911	Sun May  1 16:29:22 2011
+++ packages/kernel/kernel.spec	Sun May  1 17:22:09 2011
@@ -47,6 +47,10 @@
 
 %{?debug:%define with_verbose 1}
 
+%if %{with vanilla}
+%unglobal      with_grsecurity
+%endif
+
 %if %{without grsecurity}
 %unglobal	with_pax
 %endif
@@ -100,16 +104,20 @@
 %if "%{_alt_kernel}" == ""
 %define		alt_kernel	myown
 %endif
-%else
-%if %{without rescuecd}
-%define		__alt_kernel	%{?with_pax:pax}%{!?with_grsecurity:nogrsecurity}%{?with_pae:pae}
+%else # not myown:
+%if %{with vanilla}
+%define		alt_kernel	vanilla
+%else # not vanilla:
+%if %{with rescuecd}
+%define		alt_kernel	rescuecd
+%else # not rescuecd:
+%define		__alt_kernel	%{?with_pax:pax}%{!?with_grsec_full:nogrsecurity}%{!?with_apparmor:noaa}%{?with_pae:pae}
 %if "%{__alt_kernel}" != ""
 %define		alt_kernel	%{__alt_kernel}
 %endif
-%else
-%define		alt_kernel	rescuecd
-%endif
-%endif
+%endif # not rescuecd
+%endif # not vanilla
+%endif # not myown
 
 # kernel release (used in filesystem and eventually in uname -r)
 # modules will be looked from /lib/modules/%{kernel_release}
@@ -1538,6 +1546,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.912  2011/05/01 15:22:09  sparky
+- vanilla bcond fixes
+
 Revision 1.911  2011/05/01 14:29:22  sparky
 - netfilter config required for vanilla as well
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.911&r2=1.912&f=u