make-dist: set rpm_release correctly for release builds

Similar to autobuild-ceph 17591db, only try to set rpm_release if there
is a release part to the git describe output (i.e. if it's not at a
version tag)

Signed-off-by: Dan Mick <dan.mick@redhat.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 0ff0c9a8b9fee0f906ce84881cceb163873cb751)

diff --git a/make-dist b/make-dist
index a70e2ce90ff8272331015fa05c74bd7d00e32356..6717231821afe1e5a86c0eb1d39550eae1874f91 100755 (executable)
--- a/make-dist
+++ b/make-dist
@@ -35,8 +35,19 @@ bin/git-archive-all.sh --prefix ceph-$version/ \
 echo "including src/.git_version, src/ceph_ver.h, ceph.spec"
 src/make_version -g src/.git_version -c src/ceph_ver.h
 
-rpm_version=`echo $version | cut -d - -f 1-1`
-rpm_release=`echo $version | cut -d - -f 2- | sed 's/-/./'`
+# if the version has '-' in it, it has a 'release' part,
+# like vX.Y.Z-N-g<shortsha1>.  If it doesn't, it's just
+# vX.Y.Z.  Handle both, and translate - to . for rpm
+# naming rules (the - separates version and release).
+
+if expr index $version '-' > /dev/null; then
+       rpm_version=`echo $version | cut -d - -f 1-1`
+       rpm_release=`echo $version | cut -d - -f 2- | sed 's/-/./'`
+else
+       rpm_version=$version
+       rpm_release=0
+fi
+
 cat ceph.spec.in | \
     sed "s/@VERSION@/$rpm_version/g" | \
     sed "s/@RPM_RELEASE@/$rpm_release/g" > ceph.spec