- vanilla bcond fixes

Changed files:
    kernel.spec -> 1.912

diff --git a/kernel.spec b/kernel.spec
index 5dfe9e98299ff71eafdf2d7a490a487b37524260..f119183f070d4e2a7030078e58af2602a8dec149 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -46,6 +46,10 @@
 
 %{?debug:%define with_verbose 1}
 
+%if %{with vanilla}
+%unglobal      with_grsecurity
+%endif
+
 %if %{without grsecurity}
 %unglobal      with_pax
 %endif
@@ -99,16 +103,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}