From e8d6ec744101d8c5394c3c4138fe0c70933be1a1 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Wed, 13 Nov 2013 13:12:30 +0100
Subject: [PATCH] add the dist in the tag to prevent tag conflicts with
 different branches

---
 submit | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/submit b/submit
index 93eaba4..93dece4 100755
--- a/submit
+++ b/submit
@@ -22,7 +22,8 @@ SOCKET=$(mktemp -u)
 ssh -M -f -N -o ControlPath=$SOCKET -l $ME $SERVER
 
 # Tag GIT using the version in the spec file
-git tag -f $VERSION 2>&1 > /dev/null
+TAG=$VERSION"_"$DIST
+git tag -f $TAG 2>&1 > /dev/null
 
 # Create needed dirs on the build box
 ssh -o ControlPath=$SOCKET -l $ME $SERVER mkdir -p rpmbuild/{RPMS,SRPMS,SPECS,SOURCES}