change . into - in the kernel makefile's EXTRAVERSION as well

[linux-2.6.git] / kernel-2.6.spec

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 13ee18d..f6753de 100644 (file)
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -1,5 +1,20 @@
 %global __spec_install_pre %{___build_pre}
 
+#### Planet-Lab ####
+Vendor: PlanetLab
+Packager: PlanetLab Central <support@planet-lab.org>
+Distribution: PlanetLab %{plrelease}
+URL: %(echo %{url} | cut -d ' ' -f 2)
+
+%{!?pldistro:%global pldistro planetlab}
+
+%define name linux-2.6
+%define module_version_varname sublevel
+%define taglevel 0
+
+%define sublevel 32
+#### Planet-Lab ####
+
 Summary: The Linux kernel
 
 # For a stable, released kernel, released_kernel should be 1. For rawhide
@@ -208,7 +223,10 @@ Summary: The Linux kernel
 %if %{rhel}
 %define pkg_release %{distro_build}%{?dist}%{?buildid}
 %endif
-%define KVERREL %{rpmversion}-%{pkg_release}.%{_target_cpu}
+#### Planet-Lab ####
+%define pkg_release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+####
+%define KVERREL %{rpmversion}-%{pkg_release}-%{_target_cpu}
 
 %if !%{debugbuildsenabled}
 %define with_debug 0
@@ -506,7 +524,7 @@ AutoProv: yes\
 Name: kernel%{?variant}
 Group: System Environment/Kernel
 License: GPLv2
-URL: http://www.kernel.org/
+#URL: http://www.kernel.org/
 Version: %{rpmversion}
 Release: %{pkg_release}
 # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
@@ -3599,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}