SPECS (LINUX_2_6_17): kernel.spec - don't use %{without ...}, it m...

[sparky]

Author: sparky                       Date: Mon Nov 13 15:52:24 2006 GMT
Module: SPECS                         Tag: LINUX_2_6_17
---- Log message:
- don't use %{without ...}, it may not work after inverting bcond

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1613.2.8 -> 1.441.2.1613.2.9) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1613.2.8 SPECS/kernel.spec:1.441.2.1613.2.9
--- SPECS/kernel.spec:1.441.2.1613.2.8	Tue Oct 24 01:34:12 2006
+++ SPECS/kernel.spec	Mon Nov 13 16:52:18 2006
@@ -32,7 +32,7 @@
 
 %{?debug:%define with_verbose 1}
 
-%if %{without grsecurity}
+%if !%{with grsecurity}
 %undefine	with_grsec_full
 %undefine	with_grsec_minimal
 %undefine	with_pax
@@ -855,7 +855,7 @@
 
 %patch8 -p1
 
-%if %{without fbsplash}
+%if !%{with fbsplash}
 %patch3 -p1
 %else
 %patch4 -p1
@@ -1563,7 +1563,7 @@
 %if %{have_drm}
 %exclude /lib/modules/%{version}-%{release}/kernel/drivers/char/drm
 %endif
-%if %{without xen0} && %{without xenU}
+%if !%{with xen0} && !%{with xenU}
 %if %{have_oss} && %{have_isa}
 %exclude /lib/modules/%{version}-%{release}/kernel/drivers/media/radio/miropcm20.ko*
 %endif
@@ -1655,7 +1655,7 @@
 %defattr(644,root,root,755)
 /lib/modules/%{version}-%{release}/kernel/sound/oss
 
-%if %{without xen0} && %{without xenU}
+%if !%{with xen0} && !%{with xenU}
 %if %{have_isa}
 /lib/modules/%{version}-%{release}/kernel/drivers/media/radio/miropcm20.ko*
 %endif
@@ -1684,7 +1684,7 @@
 %if %{have_drm}
 %exclude /lib/modules/%{version}-%{release}smp/kernel/drivers/char/drm
 %endif
-%if %{without xen0} && %{without xenU}
+%if !%{with xen0} && !%{with xenU}
 %if %{have_oss} && %{have_isa}
 %exclude /lib/modules/%{version}-%{release}smp/kernel/drivers/media/radio/miropcm20.ko*
 %endif
@@ -1775,7 +1775,7 @@
 %files smp-sound-oss
 %defattr(644,root,root,755)
 /lib/modules/%{version}-%{release}smp/kernel/sound/oss
-%if %{without xen0} && %{without xenU}
+%if !%{with xen0} && !%{with xenU}
 %if %{have_isa}
 /lib/modules/%{version}-%{release}smp/kernel/drivers/media/radio/miropcm20.ko*
 %endif
@@ -1866,6 +1866,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1613.2.9  2006/11/13 15:52:18  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.441.2.1613.2.8  2006/10/23 23:34:12  mguevara
 - revert ide_acpi bcond to on - tested ok (with pax & grsecurity)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1613.2.8&r2=1.441.2.1613.2.9&f=u