From: Gerald Carter <jerry@samba.org>
Date: Mon, 10 Jul 2006 20:40:42 +0000 (+0000)
Subject: r16927: back merge of a packaging fix for release numbers (from 3.0.23)
X-Git-Tag: samba-4.0.0alpha6~801^2~8098
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=5d80b1dcd53bd0771e13f7241ab0fad238304c5b

r16927: back merge of a packaging fix for release numbers (from 3.0.23)
(This used to be commit 5b4c4928ac63d6872cf13c3cdc4a9a63405bbda4)
---

diff --git a/packaging/bin/update-pkginfo b/packaging/bin/update-pkginfo
index bcd383e4340..020c773da08 100755
--- a/packaging/bin/update-pkginfo
+++ b/packaging/bin/update-pkginfo
@@ -4,6 +4,12 @@ VERSION=$1
 RELEASE=$2
 REVISION=$3
 
+if [ "x${REVISION}" = "x" ]; then
+	RPMREVISION=""
+else
+	RPMREVISION=".${REVISION}"
+fi
+
 if [ $# -ne 3 ]; then
     echo Usage: update-pkginfo VERSION RELEASE REVISION
     exit 1
@@ -17,6 +23,6 @@ for f in `du -a | awk '{print $2}' | grep \.tmpl$`; do
         sed -e s/PVERSION/$VERSION/g \
 		-e s/PRELEASE/$RELEASE/g \
 		-e s/PREVISION/${REVISION}/g \
-		-e s/PRPMREV/.${REVISION}/g < $f > $f2
+		-e s/PRPMREV/${RPMREVISION}/g < $f > $f2
 done