rpms/kernel/devel kernel-2.6.spec,1.3261,1.3262

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30397

Modified Files:
	kernel-2.6.spec 
Log Message:
Steal an idea from Roland and automatically set upstream_sublevel based on base_sublevel, since it generally always be base_sublevel + 1. Also tweak comments a bit.


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3261
retrieving revision 1.3262
diff -u -r1.3261 -r1.3262
--- kernel-2.6.spec	3 Jul 2007 19:42:46 -0000	1.3261
+++ kernel-2.6.spec	3 Jul 2007 19:50:15 -0000	1.3262
@@ -15,8 +15,10 @@
 #% define buildid .local
 
 # fedora_build defines which build revision of this kernel version we're
-# building. In the non-kernel world, this is analogous to the Release:
-# field, and is formatted similarly.
+# building. Rather than incrementing forever, as with the prior versioning
+# setup, we set fedora_cvs_origin to the current cvs revision s/1.// of the
+# kernel spec when the kernel is rebased, so fedora_build automatically
+# works out to the offset from the rebase, so it doesn't get too ginormous.
 %define fedora_cvs_origin 3259
 %define fedora_build %(R="$Revision$"; R="${R%% \$}"; R="${R##: 1.}"; expr $R - %{fedora_cvs_origin})
 
@@ -38,7 +40,7 @@
 ## The not-released-kernel case ##
 %else
 # The next upstream release sublevel (base_sublevel+1)
-%define upstream_sublevel 22
+%define upstream_sublevel %(expr %{base_sublevel} + 1)
 # The rc snapshot level
 %define rcrev 7
 # The git snapshot level