From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 13 Feb 2018 19:26:19 +0000 (-0500)
Subject: rtslib-fb/tcmu-runner: strip 'v' prefix from RPM version
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a55b417b2f2ec926250b0e7ec1b133f86925d95d;p=ceph-build.git

rtslib-fb/tcmu-runner: strip 'v' prefix from RPM version

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/rtslib-fb/build/build_rpm b/rtslib-fb/build/build_rpm
index fd67a016..eac9627e 100644
--- a/rtslib-fb/build/build_rpm
+++ b/rtslib-fb/build/build_rpm
@@ -20,8 +20,8 @@ sudo gem install fpm
 ## Get some basic information about the system and the repository
 # Get version
 RELEASE="$(lsb_release --short -r | cut -d '.' -f 1)" # system release
-VERSION="$(git describe --abbrev=0 --tags HEAD)"
-REVISION="$(git describe --tags HEAD | cut -d - -f 2- | sed 's/-/./')"
+VERSION="$(git describe --abbrev=0 --tags HEAD | sed -e 's/v//1;')"
+REVISION="$(git describe --tags HEAD | sed -e 's/v//1;' | cut -d - -f 2- | sed 's/-/./')"
 if [ "$VERSION" = "$REVISION" ]; then
   REVISION="1"
 fi
diff --git a/tcmu-runner/build/build_rpm b/tcmu-runner/build/build_rpm
index a88fb196..7ded5f1c 100644
--- a/tcmu-runner/build/build_rpm
+++ b/tcmu-runner/build/build_rpm
@@ -79,8 +79,8 @@ gzip ${DESTDIR}/usr/share/man/man8/tcmu-runner.8
 ## Get some basic information about the system and the repository
 # Get version
 RELEASE="$(lsb_release --short -r | cut -d '.' -f 1)" # system release
-VERSION="$(git describe --abbrev=0 --tags HEAD | cut -d - -f 1)"
-REVISION="$(git describe --tags HEAD | cut -d - -f 2- | sed 's/-/./g' | sed 's/^rc/0./')"
+VERSION="$(git describe --abbrev=0 --tags HEAD | sed -e 's/v//1;' | cut -d - -f 1)"
+REVISION="$(git describe --tags HEAD | sed -e 's/v//1;' | cut -d - -f 2- | sed 's/-/./g' | sed 's/^rc/0./')"
 if [ "$VERSION" = "$REVISION" ]; then
   REVISION="1"
 fi