[SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated - eb31c33d840e5f8761c5c27f38a3fda73b0e0b8e

[Michael Adam]

The branch, v3-4-ctdb has been updated
       via  eb31c33d840e5f8761c5c27f38a3fda73b0e0b8e (commit)
       via  8f834781790cca49684d4c2d9ac6ef9b4f1078f5 (commit)
      from  793506c531bbb92db56d0b31f6f94a3a7a820a5b (commit)

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


- Log -----------------------------------------------------------------
commit eb31c33d840e5f8761c5c27f38a3fda73b0e0b8e
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jul 1 11:06:34 2009 +0200

    packaging(RHEL-CTDB): disable the merged build.
    
    Michael

commit 8f834781790cca49684d4c2d9ac6ef9b4f1078f5
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jul 1 11:02:25 2009 +0200

    Revert "s3/VERSION: Raise version number up to 3.4.0."
    
    This reverts commit bb59901d6e4f7c03b815ac6afd297b4230031330.
    
    For v3-4-ctdb, we are still based on 3.4.0rc1 + patches.
    
    Michael

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

Summary of changes:
 packaging/RHEL-CTDB/configure.rpm   |    1 +
 packaging/RHEL-CTDB/samba.spec.tmpl |    6 ++++--
 source3/VERSION                     |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm
index b9a1ee1..84e7346 100755
--- a/packaging/RHEL-CTDB/configure.rpm
+++ b/packaging/RHEL-CTDB/configure.rpm
@@ -58,6 +58,7 @@ CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure -C \
 	--without-ldb \
 	--without-dnsupdate \
 	--with-aio-support \
+	--disable-merged-build
 	$*
 
 make showlayout
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl
index a9bac92..0df0bc1 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -185,7 +185,8 @@ CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -m32" ./configure \
 	--with-ctdb=/usr/include \
 	--without-ldb \
 	--without-dnsupdate \
-	--with-aio-support
+	--with-aio-support \
+	--disable-merged-build
 
 make showlayout
 
@@ -249,7 +250,8 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
 	--with-ctdb=/usr/include \
 	--without-ldb \
 	--without-dnsupdate \
-	--with-aio-support
+	--with-aio-support\
+	--disable-merged-build
 
 make showlayout
 
diff --git a/source3/VERSION b/source3/VERSION
index 37d5272..9984a37 100644
--- a/source3/VERSION
+++ b/source3/VERSION
@@ -56,7 +56,7 @@ SAMBA_VERSION_PRE_RELEASE=
 # e.g. SAMBA_VERSION_RC_RELEASE=1                      #
 #  ->  "3.0.0rc1"                                      #
 ########################################################
-SAMBA_VERSION_RC_RELEASE=
+SAMBA_VERSION_RC_RELEASE=1
 
 ########################################################
 # To mark SVN snapshots this should be set to 'yes'    #


-- 
SAMBA-CTDB repository