rpms/kernel/F-7 kernel-2.6.spec,1.3275,1.3276

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19232

Modified Files:
	kernel-2.6.spec 
Log Message:
Fix up some uname -r issues in certain kernel version cases (due to new versioning scheme)


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3275
retrieving revision 1.3276
diff -u -r1.3275 -r1.3276
--- kernel-2.6.spec	11 Jul 2007 23:22:59 -0000	1.3275
+++ kernel-2.6.spec	12 Jul 2007 18:37:33 -0000	1.3276
@@ -1289,7 +1289,14 @@
     echo BUILDING A KERNEL FOR $Flavour %{_target_cpu}...
 
     # make sure EXTRAVERSION says what we want it to say
-    perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}$Flavour/" Makefile
+    perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = %{?stablerev}-%{release}$Flavour/" Makefile
+
+    # if pre-rc1 devel kernel, must fix up SUBLEVEL for our versioning scheme
+    %if !0%{?rcrev}
+    %if 0%{?gitrev}
+    perl -p -i -e 's/^SUBLEVEL.*/SUBLEVEL = %{upstream_sublevel}/' Makefile
+    %endif
+    %endif
 
     # and now to start the build process
 
@@ -2118,6 +2125,10 @@
 %endif
 
 %changelog
+* Thu Jul 12 2007 Jarod Wilson <jwilson at redhat.com>
+- Fix up some uname -r issues in certain kernel version
+  cases (due to new versioning scheme)
+
 * Wed Jul 11 2007 Chuck Ebbert <cebbert at redhat.com>
 - jbd: fix transaction dropping (kernel oops)
 - kvm: reinit real mode TSS on shutdown