SPECS (LINUX_2_6): kernel.spec - rename kernel-tomoyo.patch to kernel-tomoy...

[adamg]

Author: adamg                        Date: Sun Feb 15 11:41:20 2009 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- rename kernel-tomoyo.patch to kernel-tomoyo-without-apparmor.patch
- cosmetics

---- Files affected:
SPECS:
   kernel.spec (1.441.2.2067 -> 1.441.2.2068) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.2067 SPECS/kernel.spec:1.441.2.2068
--- SPECS/kernel.spec:1.441.2.2067	Sun Feb 15 12:37:23 2009
+++ SPECS/kernel.spec	Sun Feb 15 12:41:13 2009
@@ -331,8 +331,8 @@
 Patch5002:	kernel-apparmor-common.patch
 
 # tomoyo based on patch from ccs-patch-1.6.6-20090202 tarball
-Patch6000:	kernel-tomoyo.patch
-Patch6001:	kernel-tomoyo-with-apparmor.patch
+Patch6000:	kernel-tomoyo-with-apparmor.patch
+Patch6001:	kernel-tomoyo-without-apparmor.patch
 
 # for rescuecd
 # based on http://ftp.leg.uct.ac.za/pub/linux/rip/inittmpfs-2.6.14.diff.gz
@@ -930,9 +930,9 @@
 %if %{with tomoyo}
 	tar xzf %{SOURCE6000}
 	%if %{with apparmor}
-%patch6001 -p1
-	%else
 %patch6000 -p1
+	%else
+%patch6001 -p1
 	%endif
 %endif
 
@@ -1695,6 +1695,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.2068  2009/02/15 11:41:13  adamg
+- rename kernel-tomoyo.patch to kernel-tomoyo-without-apparmor.patch
+- cosmetics
+
 Revision 1.441.2.2067  2009/02/15 11:37:23  adamg
 - no verbose when unpacking tomoyo tarball
 
================================================================

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