[SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated - 3.4.2-ctdb-10-1-g479aa9e
Michael Adam
obnox at samba.org
Thu Nov 5 05:46:46 MST 2009
The branch, v3-4-ctdb has been updated
via 479aa9e60e06003dd627aa44ac3eade78a60803c (commit)
from 29173408a3d9050d83aee87b033b0e8937ce9240 (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-4-ctdb
- Log -----------------------------------------------------------------
commit 479aa9e60e06003dd627aa44ac3eade78a60803c
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 e47f449..29dcbeb 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 48b2c5c..a02244a 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
More information about the samba-cvs
mailing list