[kernel/f16] Adjust for 3.x numbering scheme

[Josh Boyer]

commit bca2221f92a30ed079a73943b1fb89a9f9068d02
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Fri Aug 5 14:44:20 2011 -0400

    Adjust for 3.x numbering scheme

 kernel.spec |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index aebc691..79be57b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -51,7 +51,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be prepended with "0.", so
 # for example a 3 here will become 0.3
 #
-%global baserelease 1
+%global baserelease 2
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -68,7 +68,7 @@ Summary: The Linux kernel
 %define stable_rc 0
 # Set rpm version accordingly
 %if 0%{?stable_update}
-%define stablerev .%{stable_update}
+%define stablerev %{stable_update}
 %define stable_base %{stable_update}
 %if 0%{?stable_rc}
 # stable RCs are incremental patches, so we need the previous stable patch
@@ -1387,14 +1387,18 @@ BuildKernel() {
     KernelVer=%{version}-%{release}.%{_target_cpu}${Flavour:+.${Flavour}}
     echo BUILDING A KERNEL FOR ${Flavour} %{_target_cpu}...
 
+    %if 0%{?stable_update}
+    # make sure SUBLEVEL is incremented on a stable release.  Sigh 3.x.
+    perl -p -i -e "s/^SUBLEVEL.*/SUBLEVEL = %{?stablerev}/" Makefile
+    %endif
+
     # make sure EXTRAVERSION says what we want it to say
-    perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = %{?stablerev}-%{release}.%{_target_cpu}${Flavour:+.${Flavour}}/" Makefile
+    perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}.%{_target_cpu}${Flavour:+.${Flavour}}/" Makefile
 
-    # if pre-rc1 devel kernel, must fix up SUBLEVEL for our versioning scheme
-    ### XXX this will probably be dead code in 3.0 --kyle
+    # if pre-rc1 devel kernel, must fix up PATCHLEVEL for our versioning scheme
     %if !0%{?rcrev}
     %if 0%{?gitrev}
-    perl -p -i -e 's/^SUBLEVEL.*/SUBLEVEL = %{upstream_sublevel}/' Makefile
+    perl -p -i -e 's/^PATCHLEVEL.*/PATCHLEVEL = %{upstream_sublevel}/' Makefile
     %endif
     %endif
 
@@ -1895,6 +1899,9 @@ fi
 # and build.
 
 %changelog
+* Fri Aug 05 2011 Josh Boyer <jwboyer at redhat.com>
+- Adjust Makefile munging for new 3.x numbering scheme
+
 * Fri Aug 05 2011 Dave Jones <davej at redhat.com>
 - Deselect CONFIG_DECNET. Unmaintained, and rubbish.