From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Fri, 3 May 2013 07:57:13 +0000 (+0200)
Subject: try to base release versioning on PDNS_TAG even harder
X-Git-Tag: auth-3.3-rc1~133
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=513a25e7501d0b25b3b1a647936eb8a1eada1a87;p=thirdparty%2Fpdns.git

try to base release versioning on PDNS_TAG even harder
---

diff --git a/build-scripts/make-jenkins-version b/build-scripts/make-jenkins-version
index f632bd1060..a2ab0ffa7f 100755
--- a/build-scripts/make-jenkins-version
+++ b/build-scripts/make-jenkins-version
@@ -27,9 +27,15 @@ then
 	rpm_version=0.0.${rpm_dbg}
 elif [[ $GIT_BRANCH = rel/* ]] || [ $PDNS_TAG != HEAD ]
 then
-	# on release branch
-	product_version=${GIT_BRANCH#rel/}
-	product=${product_version%-*} # ex: "rec" or "auth"
+	# on release branch or doing a release
+	if [[ $PDNS_TAG = $BUILDING_PRODUCT-* ]]
+	then
+		product_version=${PDNS_TAG}
+		product=$BUILDING_PRODUCT
+	else
+		product_version=${GIT_BRANCH#rel/}
+		product=${product_version%-*} # ex: "rec" or "auth"
+	fi
 	version=${product_version#*-} # ex: "3.5.1"
 	if [ "$product" = "$BUILDING_PRODUCT" ]
 	then