From e0f9ba321177863b1d3d1fff47630722ac08569e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Fri, 17 Jun 2022 14:16:35 +0200
Subject: create_tarball: Add package version into '.tdescminfo'.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit a810c4d292629e8668538231691e4b6c4274fec8)
---
 create_tarball | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/create_tarball b/create_tarball
index 166cf0d..b19dec6 100755
--- a/create_tarball
+++ b/create_tarball
@@ -134,13 +134,14 @@ tag=`git tag | \
 
 count=`git log $tag --pretty=oneline | wc -l`
 
+pkgver=$TARGET
+if [[ "$count" -gt 0 ]] || [[ -z "$target_tag" ]]; then
+    pkgver=$pkgver~pre$count+$(git rev-parse HEAD | cut -c 1-8)
+fi
 if [ "$SUFFIX" = "true" ]; then
-    package=$(basename $PWD)-trinity-$TARGET
+    package=$(basename $PWD)-trinity-$pkgver
 else
-    package=trinity-$(basename $PWD)-$TARGET
-fi
-if [[ "$count" -gt 0 ]] || [[ -z "$target_tag" ]]; then
-    package=$package~pre$count+$(git rev-parse HEAD | cut -c 1-8)
+    package=trinity-$(basename $PWD)-$pkgver
 fi
 
 # Create tarball
@@ -149,6 +150,7 @@ if [ ! -e $TARBALL_DIR/$package.tar$TAR_SUFFIX ]; then
   echo "Creating tarball in $TARBALL_DIR."
   echo "# TDE SCM module information" > .tdescminfo
   echo "Name: $MODULE" >> .tdescminfo
+  echo "Version: R$pkgver" >> .tdescminfo
   echo "Revision: $branch-$(git rev-parse HEAD)" >> .tdescminfo
   date +"DateTime: %m/%d/%Y %H:%M" -u -d "@$(git log -1 --pretty=format:"%ct")" >> .tdescminfo
   trap "rm $TARBALL_DIR/tar-$$; rm .tdescminfo; exit 1" INT
-- 
cgit v1.2.3