make rpm-pkg and version mismatch

[Arun Sharma <asharma@fb.com>]

make rpm-pkg produces files that look like: kernel-2.6.39rc5-2.x86_64.rpm
However, uname -r produces 2.6.39rc5 (-2 is missing).

This differs from how some of the distributors are packaging the kernel.
Their setup includes %{release} in uname -r.

One way to achive that is:

--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -170,4 +170,8 @@ else
        fi
 fi
 
+# Append the RPM release 
+release=`. ./scripts/mkversion`
+res="${res}-${release}"
+

But then, I have to go back and remove the %{release} in a number of
places:

--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -24,9 +24,12 @@ fi
 PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
 __KERNELRELEASE=`echo $KERNELRELEASE | sed -e "s/-/_/g"`

+# Remove the -%{release} from __KERNELRELEASE
+__KERNELVERSION=`echo $__KERNELRELEASE | sed -e "s/-[^-]*$//"`
+
 echo "Name: kernel"
 echo "Summary: The Linux Kernel"
-echo "Version: $__KERNELRELEASE"
+echo "Version: $__KERNELVERSION"
 # we need to determine the NEXT version number so that uname and
 # rpm -q will agree
 echo "Release: `. $srctree/scripts/mkversion`"

Rinse and repeat in all other places that refer to KERNELRELEASE
but want KERNELVERSION.

Is there a simpler way to do this?

 -Arun