packaging: Allow setting custom release number in RPM spec file

Signed-off-by: Martin Schwenke <martin@meltin.net>
Pair-Programmed-With: Amitay Isaacs <amitay@gmail.com>

(This used to be ctdb commit 867afb247bd8cc86c8d738f051a44cc534cafacf)

diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in
index 62fc65fe417f11b489d567b183948b75e3455650..71cf0a8d3f1c7f84671b697d77bbce612ae19292 100644 (file)
--- a/ctdb/packaging/RPM/ctdb.spec.in
+++ b/ctdb/packaging/RPM/ctdb.spec.in
@@ -5,7 +5,7 @@ Summary: Clustered TDB
 Vendor: Samba Team
 Packager: Samba Team <samba@samba.org>
 Version: @VERSION@
-Release: 1
+Release: @RELEASE@
 Epoch: 0
 License: GNU GPL version 3
 Group: System Environment/Daemons

diff --git a/ctdb/packaging/RPM/makerpms.sh b/ctdb/packaging/RPM/makerpms.sh
index 8dbec5582382890d53b537d50cc636e9b29bbc0d..9b4f139f7c4a9aff7246cc6ea041ab08c98b83cb 100755 (executable)
--- a/ctdb/packaging/RPM/makerpms.sh
+++ b/ctdb/packaging/RPM/makerpms.sh
@@ -52,12 +52,15 @@ mkdir -p `rpm --eval %_rpmdir`/noarch
 mkdir -p `rpm --eval %_rpmdir`/i386
 mkdir -p `rpm --eval %_rpmdir`/x86_64
 
-VERSION=$(${TOPDIR}/packaging/mkversion.sh ${TOPDIR}/include/ctdb_version.h)
-if [ -z "$VERSION" ]; then
+set -- $(${TOPDIR}/packaging/mkversion.sh ${TOPDIR}/include/ctdb_version.h)
+VERSION=$1
+RELEASE=$2
+if [ -z "$VERSION" -o -z "$RELEASE" ]; then
     exit 1
 fi
 
-sed -e s/@VERSION@/$VERSION/g \
+sed -e "s/@VERSION@/$VERSION/g" \
+    -e "s/@RELEASE@/$RELEASE/g" \
        < ${DIRNAME}/${SPECFILE_IN} \
        > ${DIRNAME}/${SPECFILE}
 

diff --git a/ctdb/packaging/maketarball.sh b/ctdb/packaging/maketarball.sh
index be1986932594599eba2961583792de4faf81ba35..c99bb7075935699c0db3996d9644c6c29c356366 100755 (executable)
--- a/ctdb/packaging/maketarball.sh
+++ b/ctdb/packaging/maketarball.sh
@@ -53,12 +53,15 @@ if [ $RC -ne 0 ]; then
        exit 1
 fi
 
-VERSION=$(${TOPDIR}/packaging/mkversion.sh ${VERSION_H})
-if [ -z "$VERSION" ]; then
+set -- $(${TOPDIR}/packaging/mkversion.sh ${VERSION_H})
+VERSION=$1
+RELEASE=$2
+if [ -z "$VERSION" -o -z "$RELEASE" ]; then
     exit 1
 fi
 
-sed -e s/@VERSION@/${VERSION}/g \
+sed -e "s/@VERSION@/${VERSION}/g" \
+    -e "s/@RELEASE@/$RELEASE/g" \
        < ${SPECFILE_IN} \
        > ${SPECFILE}
 

diff --git a/ctdb/packaging/mkversion.sh b/ctdb/packaging/mkversion.sh
index 4a80b253045766d2f8797791ee1ad5cb57834bc2..7a550a54f423b5a4519f854361f136fc62bd45cb 100755 (executable)
--- a/ctdb/packaging/mkversion.sh
+++ b/ctdb/packaging/mkversion.sh
@@ -42,10 +42,12 @@ case "$TAG" in
            *-*-g*) # 0.9-168-ge6cf0e8
                # Not exactly on tag: devel version.
                VERSION=`echo "$TAG" | sed 's/\([^-]\+\)-\([0-9]\+\)-\(g[0-9a-f]\+\)/\1.0.\2.\3.devel/'`
+               RELEASE=1
                ;;
            *)
                # An actual release version
                VERSION=$TAG
+               RELEASE=1
                ;;
        esac
        ;;
@@ -61,4 +63,4 @@ cat > "$OUTPUT" <<EOF
 
 EOF
 
-echo $VERSION
+echo "$VERSION $RELEASE"