From a32f51bb47fba66d5d40e3579b738af6c9211538 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Fri, 7 Jul 2017 09:56:59 +0200
Subject: [PATCH] use branch name instead of tag in revision of RPM packages

---
 Makefile | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 4dbdbb6bf..597924451 100644
--- a/Makefile
+++ b/Makefile
@@ -93,14 +93,11 @@ VERSION := $(shell git describe --tags --abbrev=0 --match v*)
 VERSION_NUM := $(shell VERSION=$(VERSION); echo $${VERSION:1})
 
 ifdef CI
-	GIT_REV := $(shell REV=$${CI_BUILD_REF}; echo $${REV:0:7})
-	GIT_BRANCH = ${CI_BUILD_REF_NAME}
 	VARIANT := $(VARIANT)-ci
-else
-	GIT_REV := $(shell REV=$$(git rev-parse HEAD); echo $${REV:0:7})
-	GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 endif
 
+GIT_REV    := $(shell git rev-parse --short=7    HEAD)
+GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 
 # pkg-config dependencies
 PKGS = libconfig