Author: thomas
Date: Fri Feb 16 22:10:04 2007
New Revision: 122034
Modified:
packages/cooker/kernel-linus/current/SPECS/kernel-linus.spec
Log:
fix RC versioning
Modified: packages/cooker/kernel-linus/current/SPECS/kernel-linus.spec
==============================================================================
--- packages/cooker/kernel-linus/current/SPECS/kernel-linus.spec
(original)
+++ packages/cooker/kernel-linus/current/SPECS/kernel-linus.spec Fri Feb
16 22:10:04 2007
@@ -27,14 +27,18 @@
%define kstable 0
# this is the releaseversion
-%define mdvrelease 1
+%define mdvrelease 2
# This is only to make life easier for people that creates derivated kernels
# a.k.a name it kernel-tmb :)
%define kname kernel-linus
%define rpmtag %distsuffix
+%if %kpatch
+%define rpmrel %mkrel 0.%{kpatch}.%{mdvrelease}
+%else
%define rpmrel %mkrel %{mdvrelease}
+%endif
# theese two never change, they are used to fool rpm/urpmi/smart
%define fakever 1
@@ -42,7 +46,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
@@ -56,7 +60,12 @@
%define kverrel %{kversion}-%{rpmrel}
# used for not making too long names for rpms or search paths
+%if %kpatch
+%define buildrpmrel 0.%{kpatch}.%{mdvrelease}%{rpmtag}
+%else
%define buildrpmrel %{mdvrelease}%{rpmtag}
+%endif
+
%define buildrel %{kversion}-%{buildrpmrel}
%define klinus_notice NOTE: This kernel has no Mandriva patches and no
third-party drivers.
@@ -500,15 +509,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 -s mrproper
cp arch/%{target_arch}/$config_name .config
@@ -1040,6 +1045,9 @@
%changelog
+* Fri Feb 16 2007 Thomas Backlund <[EMAIL PROTECTED]> 2.6.20-2mdv
+- fix RC versioning
+
* Mon Feb 5 2007 Thomas Backlund <[EMAIL PROTECTED]> 2.6.20-1mdv
- update to kernel.org 2.6.20 final
