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 bcd383e43406ae9f282a9c2128d11c14ba503357..020c773da08a80e4a439e986b0d5a978cb5e2635 100755 (executable)
--- 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