SPECS (LINUX_2_6): kernel.spec - tomoyo patch for apparmor enabled kernel

[adamg]

Author: adamg                        Date: Sun Feb 15 11:34:48 2009 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- tomoyo patch for apparmor enabled kernel

---- Files affected:
SPECS:
   kernel.spec (1.441.2.2065 -> 1.441.2.2066) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.2065 SPECS/kernel.spec:1.441.2.2066
--- SPECS/kernel.spec:1.441.2.2065	Sat Feb 14 23:36:22 2009
+++ SPECS/kernel.spec	Sun Feb 15 12:34:41 2009
@@ -95,10 +95,6 @@
 %define		have_sound	0
 %endif
 
-%if %{with tomoyo}
-%undefine	with_apparmor
-%endif
-
 %ifarch %{ix86} alpha ppc
 %define		have_isa	1
 %else
@@ -336,6 +332,7 @@
 
 # tomoyo based on patch from ccs-patch-1.6.6-20090202 tarball
 Patch6000:	kernel-tomoyo.patch
+Patch6001:	kernel-tomoyo-with-apparmor.patch
 
 # for rescuecd
 # based on http://ftp.leg.uct.ac.za/pub/linux/rip/inittmpfs-2.6.14.diff.gz
@@ -931,8 +928,12 @@
 
 # tomoyo
 %if %{with tomoyo}
+	tar xzvf %{SOURCE6000}
+	%if %{with apparmor}
+%patch6001 -p1
+	%else
 %patch6000 -p1
-tar xzvf %{SOURCE6000}
+	%endif
 %endif
 
 %patch150 -p1
@@ -1694,6 +1695,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.2066  2009/02/15 11:34:41  adamg
+- tomoyo patch for apparmor enabled kernel
+
 Revision 1.441.2.2065  2009/02/14 22:36:22  adamg
 - note on unsupported bcond combos
 
================================================================

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