Author: thomas
Date: Sun Feb 18 00:09:53 2007
New Revision: 122202
Modified:
packages/cooker/kernel-tmb/current/SPECS/kernel-tmb.spec
Log:
fix RC versioning
Modified: packages/cooker/kernel-tmb/current/SPECS/kernel-tmb.spec
==============================================================================
--- packages/cooker/kernel-tmb/current/SPECS/kernel-tmb.spec (original)
+++ packages/cooker/kernel-tmb/current/SPECS/kernel-tmb.spec Sun Feb 18
00:09:53 2007
@@ -11,13 +11,17 @@
%define kstable 0
# this is the releaseversion
-%define kbuild 3
+%define kbuild 4
%define ktag tmb
%define kname kernel-%{ktag}
%define rpmtag %distsuffix
+%if %kpatch
+%define rpmrel %mkrel 0.%{kpatch}.%{kbuild}
+%else
%define rpmrel %mkrel %{kbuild}
+%endif
# theese two never change, they are used to fool rpm/urpmi/smart
%define fakever 1
@@ -25,7 +29,7 @@
# When we are using a pre/rc patch, the tarball is a sublevel -1
%if %kpatch
-%define kversion %{kernelversion}.%{patchlevel}.%{sublevel}.0.%{kpatch}
+%define kversion %{kernelversion}.%{patchlevel}.%{sublevel}
%define tar_ver %{kernelversion}.%{patchlevel}.%(expr
%{sublevel} - 1)
%else
%if %kstable
@@ -40,7 +44,11 @@
%define kverrel %{kversion}-%{rpmrel}
# used for not making too long names for rpms or search paths
-%define buildrpmrel %{kbuild}%{rpmtag}
+%if %kpatch
+%define buildrpmrel 0.%{kpatch}.%{kbuild}%{rpmtag}
+%else
+%define buildrpmrel %{kbuild}%{rpmtag}
+%endif
%define buildrel %{kversion}-%{buildrpmrel}
# having different top level names for packges means that you have to remove
them by hard :(
@@ -1141,15 +1149,11 @@
fi
# make sure EXTRAVERSION says what we want it to say
-%if %kpatch
- LC_ALL=C perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION =
.0.%{kpatch}-$extension/" Makefile
-%else
%if %kstable
LC_ALL=C perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION =
.%{kstable}-$extension/" Makefile
%else
LC_ALL=C perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -$extension/"
Makefile
%endif
-%endif
%smake oldconfig
}
@@ -2150,6 +2154,9 @@
%endif
%changelog
+* Sun Feb 18 2007 Thomas Backlund <[EMAIL PROTECTED]> 2.6.20-4mdv
+- fix RC versioning
+
* Sun Feb 11 2007 Thomas Backlund <[EMAIL PROTECTED]> 2.6.20-3mdv
- update patch CK00: rotating staircase deadline scheduler 0.14
- add patches DC01-DC05: agpgart 1.0.2 (request by Colin Guthrie)
