rpms/kernel/FC-6 kernel-2.6.spec,1.2972,1.2973

[fedora-cvs-commits at redhat.com]

Author: jwilson

Update of /cvs/dist/rpms/kernel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv3821

Modified Files:
	kernel-2.6.spec 
Log Message:
A few minor conditional tweaks and additional infrastructure for automagic application of stable release incrementals when applicable


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2972
retrieving revision 1.2973
diff -u -r1.2972 -r1.2973
--- kernel-2.6.spec	10 Jul 2007 19:02:03 -0000	1.2972
+++ kernel-2.6.spec	10 Jul 2007 21:34:55 -0000	1.2973
@@ -28,11 +28,11 @@
 %define base_sublevel 22
 
 ## If this is a released kernel ##
-%if %{released_kernel}
+%if 0%{?released_kernel}
 # Do we have a 2.6.21.y update to apply?
 %define stable_update 0
 # Set rpm version accordingly
-%if 0%{stable_update}
+%if 0%{?stable_update}
 %define stablerev .%{stable_update}
 %endif
 %define rpmversion 2.6.%{base_sublevel}%{?stablerev}
@@ -111,7 +111,7 @@
 %define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
 
 # pkg_release is what we'll fill in for the rpm Release: field
-%if %{released_kernel}
+%if 0%{?released_kernel}
 %define pkg_release %{fedora_build}%{?buildid}%{?dist}
 %else
 %if 0%{?rcrev}
@@ -472,8 +472,23 @@
 ### BRANCH PATCH ###
 %else
 # Here should be only the patches up to the upstream canonical Linus tree.
+
+# For a stable release kernel
+%if 0%{?stable_update}
+Patch00: patch-2.6.%{base_sublevel}.1.bz2
+# at present, you'll have to manually uncomment needed incrementals
+# here to get up to 2.6.%{base_sublevel}.%{stable_update}, but they will
+# all be automatically applied
+#Patch01: patch-2.6.%{base_sublevel}.1-2.bz2
+#Patch02: patch-2.6.%{base_sublevel}.2-3.bz2
+#Patch03: patch-2.6.%{base_sublevel}.3-4.bz2
+#Patch04: patch-2.6.%{base_sublevel}.4-5.bz2
+#Patch05: patch-2.6.%{base_sublevel}.5-6.bz2
+
+# non-released_kernel case
 # These are automagically defined by the rcrev and gitrev values set up 
 # near the top of this spec file.
+%else
 %if 0%{?rcrev}
 Patch00: patch-2.6.%{upstream_sublevel}-rc%{rcrev}.bz2
 %if 0%{?gitrev}
@@ -485,6 +500,7 @@
 Patch00: patch-2.6.%{base_sublevel}-git%{gitrev}.bz2
 %endif
 %endif
+%endif
 
 %endif
 
@@ -943,6 +959,18 @@
 %else
 
 # Update to latest upstream.
+# released_kernel with stable_update available case
+%if 0%{?stable_update}
+ApplyPatch patch-2.6.%{base_sublevel}.1.bz2
+if [ %{stable_update} -ge 2 ]; then
+  for p in `seq 2 %{stable_update}`; do
+    let o=p-1
+    ApplyPatch patch-2.6.%{base_sublevel}.$o-$p.bz2
+  done
+fi
+
+# non-released_kernel case
+%else
 %if 0%{?rcrev}
 ApplyPatch patch-2.6.%{upstream_sublevel}-rc%{rcrev}.bz2
 %if 0%{?gitrev}
@@ -954,6 +982,7 @@
 ApplyPatch patch-2.6.%{base_sublevel}-git%{gitrev}.bz2
 %endif
 %endif
+%endif
 
 %endif