From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 7 Dec 2010 11:18:26 +0000 (+0100)
Subject: undo 2 previous attempts as nothing simple seems to work
X-Git-Tag: linux-2.6-32-0^0
X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=commitdiff_plain;h=b8a55a7a9e914873d2d510081cc83b6ee61d192e

undo 2 previous attempts as nothing simple seems to work
---

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index f6753de31..9c70676d4 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -226,7 +226,7 @@ Summary: The Linux kernel
 #### Planet-Lab ####
 %define pkg_release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 ####
-%define KVERREL %{rpmversion}-%{pkg_release}-%{_target_cpu}
+%define KVERREL %{rpmversion}-%{pkg_release}.%{_target_cpu}
 
 %if !%{debugbuildsenabled}
 %define with_debug 0
@@ -3617,7 +3617,7 @@ BuildKernel() {
     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 = %{?stablerev}-%{release}-%{_target_cpu}${Flavour:+.${Flavour}}/" Makefile
+    perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = %{?stablerev}-%{release}.%{_target_cpu}${Flavour:+.${Flavour}}/" Makefile
 
     # if pre-rc1 devel kernel, must fix up SUBLEVEL for our versioning scheme
     %if !0%{?rcrev}