From 4ddb8de08e4102b79b224619f50c4310dbb6b1eb Mon Sep 17 00:00:00 2001
From: Trevor Batley <trevor@batley.id.au>
Date: Fri, 17 Nov 2023 09:35:33 +1100
Subject: [PATCH] add release back into tag

---
 git-cvs2git.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/git-cvs2git.sh b/git-cvs2git.sh
index 8694c5d..39c6fda 100755
--- a/git-cvs2git.sh
+++ b/git-cvs2git.sh
@@ -755,9 +755,8 @@ git push --force -u $QUIET origin master
 # Now create the version and release tag for these files
 RELEASE=`rpm --queryformat '%{release}\n' --specfile $NAME.spec | head -n 1`
 # Release is not reliable - if you run on Rocky it comes back EL8, centos 7  - EL7
-# so - confusing!!
-# for now - take out the RELEASE from the tag
-TAG=$VERSION
+# So, we need to just take the build part (first word)
+TAG=$VERSION"-"${RELEASE%.*}
 git tag -a $TAG -m "$COMMENT"
 git push origin $TAG $QUIET