packages (LINUX_2_6_35): kernel/kernel.spec - added vanilla bcond: disables...

[sparky]

Author: sparky                       Date: Sun May  1 14:40:47 2011 GMT
Module: packages                      Tag: LINUX_2_6_35
---- Log message:
- added vanilla bcond: disables all patches and extra configs

---- Files affected:
packages/kernel:
   kernel.spec (1.837.2.9 -> 1.837.2.10) 

---- Diffs:

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.837.2.9 packages/kernel/kernel.spec:1.837.2.10
--- packages/kernel/kernel.spec:1.837.2.9	Fri Apr 29 12:13:19 2011
+++ packages/kernel/kernel.spec	Sun May  1 16:40:42 2011
@@ -49,8 +49,8 @@
 %bcond_without	tuxonice	# support for tuxonice (ex-suspend2) (enabled by default)
 %bcond_without	apparmor	# build kernel with apparmor (exerimental mix)
 
+%bcond_with	vanilla		# don't include any patches
 %bcond_with	rescuecd	# build kernel for our rescue
-
 %bcond_with	myown		# build with your own config (kernel-myown.config)
 
 %{?debug:%define with_verbose 1}
@@ -702,6 +702,8 @@
 %{__bzip2} -dc %{SOURCE1} | patch -p1 -s
 %endif
 
+%if %{without vanilla}
+
 # tuxonice:
 %if %{with tuxonice}
 %patch69 -p1
@@ -853,6 +855,8 @@
 # routes
 %patch300 -p1
 
+%endif # vanilla
+
 # Small fixes:
 %patch2000 -p1
 %patch2001 -p1
@@ -1041,6 +1045,7 @@
 		$RPM_SOURCE_DIR/kernel-%{alt_kernel}.config \
 %endif
 		important.config \
+%if %{without vanilla}
 %if %{with rescuecd}
 		%{SOURCE58} \
 		%{SOURCE59} \
@@ -1079,8 +1084,9 @@
 		%{SOURCE42} \
 %endif
 %endif
-		%{SOURCE40} %{?0:netfilter} \
 		%{SOURCE41} %{?0:patches} \
+%endif
+		%{SOURCE40} %{?0:netfilter} \
 		%{SOURCE20} \
 		$RPM_SOURCE_DIR/$Config
 }
@@ -1593,6 +1599,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.10  2011/05/01 14:40:42  sparky
+- added vanilla bcond: disables all patches and extra configs
+
 Revision 1.837.2.9  2011/04/29 10:13:19  areq
 - 2.6.35.13
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.837.2.9&r2=1.837.2.10&f=u