summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2006-07-10 20:40:42 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:19:12 -0500
commit5d80b1dcd53bd0771e13f7241ab0fad238304c5b (patch)
tree550ef4ce6d14eb7cc2db78240046353ecbf8b00a /packaging
parent66259d06fb8c3f24480b0fe46b93e5dc34b5e0a5 (diff)
downloadsamba-5d80b1dcd53bd0771e13f7241ab0fad238304c5b.tar.gz
samba-5d80b1dcd53bd0771e13f7241ab0fad238304c5b.tar.bz2
samba-5d80b1dcd53bd0771e13f7241ab0fad238304c5b.zip
r16927: back merge of a packaging fix for release numbers (from 3.0.23)
(This used to be commit 5b4c4928ac63d6872cf13c3cdc4a9a63405bbda4)
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/bin/update-pkginfo8
1 files changed, 7 insertions, 1 deletions
diff --git a/packaging/bin/update-pkginfo b/packaging/bin/update-pkginfo
index bcd383e434..020c773da0 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