[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated - build_3.2.7_ctdb.54-35-gfc122aa

[Michael Adam]

The branch, v3-2-ctdb has been updated
       via  fc122aa276bce379b492e5bdf52ab3e03bc3737f (commit)
       via  0d81cebfa2d5fa75869e2634f13f9b4db0b1c118 (commit)
       via  4a388381fce3f78e998db88b0b00bb7e042bca0b (commit)
      from  462760c412aa86c57600ca7c87a28ed4de1ab60a (commit)

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


- Log -----------------------------------------------------------------
commit fc122aa276bce379b492e5bdf52ab3e03bc3737f
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jan 21 11:03:34 2009 +0100

    packaging(RHEL-CTDB): extend makespec.sh to extract VENDOR_PATCH from version.h
    
    Michael

commit 0d81cebfa2d5fa75869e2634f13f9b4db0b1c118
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jan 21 10:24:31 2009 +0100

    packaging(RHEL-CTDB): The former release number has basically moved into VERSION
    
    Michael

commit 4a388381fce3f78e998db88b0b00bb7e042bca0b
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jan 21 10:21:31 2009 +0100

    VERSION: add vendor suffix ("ctdb") and vendor patch level
    
    Michael

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

Summary of changes:
 packaging/RHEL-CTDB/makespec.sh     |    4 ++++
 packaging/RHEL-CTDB/samba.spec.tmpl |    2 +-
 source/VERSION                      |    4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RHEL-CTDB/makespec.sh b/packaging/RHEL-CTDB/makespec.sh
index ae58db0..62f0969 100755
--- a/packaging/RHEL-CTDB/makespec.sh
+++ b/packaging/RHEL-CTDB/makespec.sh
@@ -26,6 +26,10 @@ vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX ${VERSION_H} | awk '{print $3}'
 if test "x${vendor_version}"  != "x" ; then
 	VERSION="${VERSION}-${vendor_version}"
 fi
+vendor_patch=`grep SAMBA_VERSION_VENDOR_PATCH ${VERSION_H} | awk '{print $3}'`
+if test "x${vendor_patch}" != "x" ; then
+	VERSION="${VERSION}-${vendor_patch}"
+fi
 VERSION=`echo ${VERSION} | sed 's/-/_/g'`
 VERSION=`echo ${VERSION} | sed 's/\"//g'`
 echo "VERSION: ${VERSION}"
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl
index 86d54da..2c29110 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:      ctdb.55
+Release:      1
 Epoch:        0
 License: GNU GPL version 3
 Group: System Environment/Daemons
diff --git a/source/VERSION b/source/VERSION
index 6a7c8fc..bdcb7de 100644
--- a/source/VERSION
+++ b/source/VERSION
@@ -95,5 +95,5 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=
 # e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version()    #
 #  ->  "CVS 3.0.0rc2-VendorVersion"                    #
 ########################################################
-SAMBA_VERSION_VENDOR_SUFFIX=
-SAMBA_VERSION_VENDOR_PATCH=
+SAMBA_VERSION_VENDOR_SUFFIX="ctdb"
+SAMBA_VERSION_VENDOR_PATCH=55


-- 
SAMBA-CTDB repository