fedora-cvs-commits@redhat.com
[Top] [All Lists]

rpms/kernel/FC-6 kernel-2.6.spec,1.2981,1.2982

Subject: rpms/kernel/FC-6 kernel-2.6.spec,1.2981,1.2982
From:
Date: Thu, 12 Jul 2007 14:38:22 -0400
Author: jwilson

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

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/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2981
retrieving revision 1.2982
diff -u -r1.2981 -r1.2982
--- kernel-2.6.spec     11 Jul 2007 22:36:34 -0000      1.2981
+++ kernel-2.6.spec     12 Jul 2007 18:38:19 -0000      1.2982
@@ -1271,7 +1271,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
 
@@ -2100,6 +2107,10 @@
 %endif
 
 %changelog
+* Thu Jul 12 2007 Jarod Wilson <jwilson@xxxxxxxxxx>
+- Fix up some uname -r issues in certain kernel version
+  cases (due to new versioning scheme)
+
 * Wed Jul 11 2007 Chuck Ebbert <cebbert@xxxxxxxxxx>
 - jbd: fix transaction dropping (kernel oops)
 

-- 
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits

<Prev in Thread] Current Thread [Next in Thread>
  • rpms/kernel/FC-6 kernel-2.6.spec,1.2981,1.2982, fedora-cvs-commits <=