For upstream snapshot versions do not modify git-describe output.

For upstream version directly use the output of git-describe
(X.Y.Z-number.gHASH) rather than rather than changing it to
(X.Y.Z+number.gHASH).

The rpm version does not allow '-' in Version, so we create and use
rpm_upstream_version in the rpm spec file.  That is of format:
X.Y.Z+number.gHASH

1 files changed, 1 insertions, 8 deletions

diff --git a/tools/make-tarball b/tools/make-tarball
index 57358447..d8705896 100755
--- a/tools/make-tarball
+++ b/tools/make-tarball
@@ -35,14 +35,7 @@ while [ $# -ne 0 ]; do
 done
 
 rev=${1:-HEAD}
-git_describe=$(git describe ${long_opt} $rev)
-
-# git_describe could be 0.7.5 or 0.7.5-NNN-gHASH
-# turn that into 0.7.5 or 0.7.5+NNN.gHASH
-case "$git_describe" in
-   *-*) version=$(echo "$git_describe" | sed -e 's/-/+/' -e 's/-/./');;
-   *) version=${git_describe};;
-esac
+version=$(git describe ${long_opt} $rev)
 
 archive_base="cloud-init-$version"
 if [ -z "$output" ]; then