From b5982b361d724ec5fdf3fc8bb6addb8c5139aaa2 Mon Sep 17 00:00:00 2001
From: Gregor Riepl <gregor.riepl@swisstxt.ch>
Date: Fri, 30 Jun 2023 14:26:20 +0200
Subject: [PATCH] Only add commit id to version when not tagged

---
 Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 042fa4a..e3893ef 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,11 @@ VERSION=6.0
 RELEASE=1
 COMMIT:=$(shell git rev-parse HEAD)
 SHORT_COMMIT:=$(shell git rev-parse --short ${COMMIT})
+GIT_TAG:=$(shell git tag --points-at ${COMMIT})
+ifeq '${GIT_TAG}' ''
+# development release, add git commit sha
+RELEASE:=${RELEASE}.git${SHORT_COMMIT}
+endif
 
 all: build
 
@@ -21,7 +26,7 @@ build: clean
 	cp -r ./SOURCES/* ./rpmbuild/SOURCES/
 	rpmbuild -ba SPECS/${PACKAGE}.spec \
 	--define "ver ${VERSION}" \
-	--define "rel ${RELEASE}.git${SHORT_COMMIT}" \
+	--define "rel ${RELEASE}" \
 	--define "dist ${DISTRIBUTION}" \
 	--define "_topdir %(pwd)/rpmbuild" \
 	--define "_builddir %{_topdir}" \