packaging(RHEL-CTDB): add the current githash to the rpm release number by default

Disable this (to build a release-rpm) by calling

USE_GITHASH=no makerpms.sh

Michael

diff --git a/packaging/RHEL-CTDB/makespec.sh b/packaging/RHEL-CTDB/makespec.sh
index e47f44936a53be81973d6531d17eb7f6fdf8b8c4..29dcbeb30e495909bd5c27015ed9d2134955abf1 100755 (executable)
--- a/packaging/RHEL-CTDB/makespec.sh
+++ b/packaging/RHEL-CTDB/makespec.sh
@@ -33,7 +33,20 @@ fi
 VERSION=`echo ${VERSION} | sed 's/-/_/g'`
 VERSION=`echo ${VERSION} | sed 's/\"//g'`
 echo "VERSION: ${VERSION}"
 VERSION=`echo ${VERSION} | sed 's/-/_/g'`
 VERSION=`echo ${VERSION} | sed 's/\"//g'`
 echo "VERSION: ${VERSION}"

+
+# to build a release-rpm, set USE_GITHASH="no"
+# in the environmet
+#
+if test "x$USE_GITHASH" = "xno" ; then
+       GITHASH=""
+       echo "GITHASH: not used"
+else
+       GITHASH=".$(git log --pretty=format:%h -1)"
+       echo "GITHASH: ${GITHASH}"
+fi
+

 sed -e s/PVERSION/${VERSION}/g \
 sed -e s/PVERSION/${VERSION}/g \

+       -e s/GITHASH/${GITHASH}/g \

        < ${SPECFILE}.tmpl \
        > ${SPECFILE}
 
        < ${SPECFILE}.tmpl \
        > ${SPECFILE}
 

diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl
index 48b2c5c4b9b8d5d9506c89e85048a8ac02a0ac06..a02244a63ceec74de82dd504f062aa72f8164446 100644 (file)
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -6,7 +6,7 @@ Vendor: Samba Team
 Packager: Samba Team <samba@samba.org>
 Name:         samba
 Version:      PVERSION
 Packager: Samba Team <samba@samba.org>
 Name:         samba
 Version:      PVERSION

-Release:      1
+Release:      1GITHASH

 Epoch:        0
 License: GNU GPL version 3
 Group: System Environment/Daemons
 Epoch:        0
 License: GNU GPL version 3
 Group: System Environment/Daemons