SPECS (LINUX_2_6): kernel.spec - prepare bconds for being new default Th ke...

[arekm]

Author: arekm                        Date: Mon Nov  3 17:37:28 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- prepare bconds for being new default Th kernel

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1995 -> 1.441.2.1996) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1995 SPECS/kernel.spec:1.441.2.1996
--- SPECS/kernel.spec:1.441.2.1995	Mon Nov  3 02:17:20 2008
+++ SPECS/kernel.spec	Mon Nov  3 18:37:21 2008
@@ -23,7 +23,7 @@
 
 %bcond_without	grsecurity	# don't build grsecurity nor pax at all
 %bcond_without	grsec_minimal	# build only minimal subset (proc,link,fifo,shm)
-%bcond_with	grsec_full	# build full grsecurity
+%bcond_without	grsec_full	# build full grsecurity
 %bcond_with	pax_full	# build pax and full grsecurity (ie. grsec_full && pax)
 %bcond_with	pax		# build pax support
 
@@ -37,7 +37,7 @@
 
 %bcond_without	vserver		# support for VServer (enabled by default)
 %bcond_without	tuxonice	# support for tuxonice (ex-suspend2) (enabled by default)
-%bcond_with	apparmor	# build kernel with apparmor (exerimental mix)
+%bcond_without	apparmor	# build kernel with apparmor (exerimental mix)
 
 %bcond_with	rescuecd	# build kernel for our rescue
 
@@ -112,7 +112,7 @@
 %define		netfilter_snap		20070806
 %define		xen_version		3.0.2
 
-%define		_alt_kernel	%{?with_pax:-pax}%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}%{?with_rescuecd:-rescuecd}%{?with_pae:-pae}%{?with_myown:-myown}%{?with_apparmor:-aa}
+%define		_alt_kernel	%{?with_pax:-pax}%{!?with_grsec_full:-nogrsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}%{?with_rescuecd:-rescuecd}%{?with_pae:-pae}%{?with_myown:-myown}%{!?with_apparmor:-noaa}
 
 # kernel release (used in filesystem and eventually in uname -r)
 # modules will be looked from /lib/modules/%{kernel_release}
@@ -1639,6 +1639,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1996  2008/11/03 17:37:21  arekm
+- prepare bconds for being new default Th kernel
+
 Revision 1.441.2.1995  2008/11/03 01:17:20  zbyniu
 - added patch for apparmor vfs changes in unionfs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1995&r2=1.441.2.1996&f=u