[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated - 3.2.11-ctdb-65-8-gdd98b54

[Michael Adam]

The branch, v3-2-ctdb has been updated
       via  dd98b54f5b7bb9ab178f7cdda7128ca512d90ed9 (commit)
      from  67e13766284ac39e9a7e1098a7252c7f5243d447 (commit)

http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb


- Log -----------------------------------------------------------------
commit dd98b54f5b7bb9ab178f7cdda7128ca512d90ed9
Author: Michael Adam <obnox at samba.org>
Date:   Wed Nov 4 12:26:46 2009 +0100

    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

-----------------------------------------------------------------------

Summary of changes:
 packaging/RHEL-CTDB/makespec.sh     |   13 +++++++++++++
 packaging/RHEL-CTDB/samba.spec.tmpl |    2 +-
 2 files changed, 14 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RHEL-CTDB/makespec.sh b/packaging/RHEL-CTDB/makespec.sh
index 62f0969..c0dc5fa 100755
--- 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}"
+
+# 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 \
+	-e s/GITHASH/${GITHASH}/g \
 	< ${SPECFILE}.tmpl \
 	> ${SPECFILE}
 
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl
index ded2c08..126a5e7 100644
--- 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 at samba.org>
 Name:         samba
 Version:      PVERSION
-Release:      1
+Release:      1GITHASH
 Epoch:        0
 License: GNU GPL version 3
 Group: System Environment/Daemons


-- 
SAMBA-CTDB repository