rpms/kernel/devel kernel-2.6.spec,1.3257,1.3258

[Dave Jones (davej)]

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
more versioning tweaks


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3257
retrieving revision 1.3258
diff -u -r1.3257 -r1.3258
--- kernel-2.6.spec	3 Jul 2007 16:45:36 -0000	1.3257
+++ kernel-2.6.spec	3 Jul 2007 19:02:15 -0000	1.3258
@@ -1,7 +1,8 @@
 Summary: The Linux kernel (the core of the Linux operating system)
 
-# For a stable, released kernel, released_kernel should be 1. For rawhide and/or
-# a kernel built from an rc or git snapshot, released_kernel should be 0.
+# For a stable, released kernel, released_kernel should be 1. For rawhide
+# and/or a kernel built from an rc or git snapshot, released_kernel should
+# be 0.
 %define released_kernel 0
 
 # Versions of various parts
@@ -13,9 +14,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.
-%define fedora_build 2%{?dist}
+# 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.
+%define fedora_build %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?} | sed s/1\.//)
 
 # base_sublevel is the kernel version we're starting with and patching
 # on top of -- for example, 2.6.22-rc7-git1 starts with a 2.6.21 base,
@@ -107,7 +109,7 @@
 
 # pkg_release is what we'll fill in for the rpm Release: field
 %if %{released_kernel}
-%define pkg_release %{fedora_build}%{?buildid}
+%define pkg_release %{fedora_build}%{?dist}%{?buildid}
 %else
 %if 0%{?rcrev}
 %define rctag .rc%rcrev
@@ -118,7 +120,7 @@
 %define rctag .rc0
 %endif
 %endif
-%define pkg_release 0%{?rctag}%{?gittag}.%{fedora_build}%{?buildid}
+%define pkg_release 0.%{fedora_build}%{?buildid}%{?rctag}%{?gittag}%{?dist}
 %endif
 
 # The kernel tarball/base version