packaging: use githash in rpm release by default.

setting USE_GITHASH=no in the environment makes
makerpms.sh omit the git hash

Michael

diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec.in
similarity index 99%
rename from packaging/RPM/ctdb.spec
rename to packaging/RPM/ctdb.spec.in
index a64b4b87d0fcaf471cb674ca3a35c5080250b17a..65a72fa06f541d402a1eb2d6d9e2caa5a75489ad 100644 (file)
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec.in
@@ -5,7 +5,7 @@ Vendor: Samba Team
 Packager: Samba Team <samba@samba.org>
 Name: ctdb
 Version: 1.0.102
-Release: 1
+Release: 1GITHASH
 Epoch: 0
 License: GNU GPL version 3
 Group: System Environment/Daemons

diff --git a/packaging/RPM/makerpms.sh b/packaging/RPM/makerpms.sh
index 846ab7f70f8c13836a14e9ec839c7189376c3fca..a51099c543e9ab58e4b58cb717d149e55c9f70dd 100755 (executable)
--- a/packaging/RPM/makerpms.sh
+++ b/packaging/RPM/makerpms.sh
@@ -41,8 +41,19 @@ SPECDIR=`rpm --eval %_specdir`
 SRCDIR=`rpm --eval %_sourcedir`
 
 SPECFILE="ctdb.spec"
+SPECFILE_IN="ctdb.spec.in"
 RPMBUILD="rpmbuild"
 
+GITHASH=".$(git log --pretty=format:%h -1)"
+
+if test "x$USE_GITHASH" = "xno" ; then
+       GITHASH=""
+fi
+
+sed -e s/GITHASH/${GITHASH}/g \
+       < ${DIRNAME}/${SPECFILE_IN} \
+       > ${DIRNAME}/${SPECFILE}
+
 VERSION=$(grep ^Version ${DIRNAME}/${SPECFILE} | sed -e 's/^Version:\ \+//')
 RELEASE=$(grep ^Release ${DIRNAME}/${SPECFILE} | sed -e 's/^Release:\ \+//')