[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated - build_3.2.3_ctdb.51-181-gae1fad2

[Michael Adam]

The branch, v3-2-ctdb has been updated
       via  ae1fad25cafab7ed2e1693f96d7900862262ccf6 (commit)
       via  96c811cf222be5463a6705feae73d6215685c5f1 (commit)
      from  5cd8ff8a2aba6b1d6821d4ebb986449b03d40542 (commit)

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


- Log -----------------------------------------------------------------
commit ae1fad25cafab7ed2e1693f96d7900862262ccf6
Author: Michael Adam <obnox at samba.org>
Date:   Wed Dec 17 18:58:25 2008 +0100

    Revert "VERSION: add "ctdb" vendor suffix"
    
    This reverts commit cd6a7fabe82db4d90699b6827fed5bc00877e788.
    
    This needs discussion first.
    
    Michael

commit 96c811cf222be5463a6705feae73d6215685c5f1
Author: Michael Adam <obnox at samba.org>
Date:   Wed Dec 17 18:56:34 2008 +0100

    packaging(RHEL-CTDB): fix build of [u]mount.cifs
    
    mount.cifs is now built by make everything.
    And it needs extra objects anyways (mtab.o),
    which is why the build of mount.cifs failed.
    
    Michael

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

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


Changeset truncated at 500 lines:

diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl
index 5f31d36..ba362f0 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -193,12 +193,6 @@ fi
 make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %{?_smp_mflags} \
 	all modules pam_smbpass
 
-## build the cifs fs mount helper
-cd client
-gcc  -o mount.cifs $RPM_OPT_FLAGS  -D_GNU_SOURCE -Wall -D_GNU_SOURCE -D_LARGEFILE64_SOURCE mount.cifs.c
-gcc  -o umount.cifs $RPM_OPT_FLAGS  -D_GNU_SOURCE -Wall -D_GNU_SOURCE -D_LARGEFILE64_SOURCE umount.cifs.c
-cd ..
-
 # Remove some permission bits to avoid to many dependencies
 cd ..
 find examples docs -type f | xargs -r chmod -x
@@ -267,8 +261,8 @@ install -m644 setup/samba.pamd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/samba
 install -m755 setup/smbprint $RPM_BUILD_ROOT%{_bindir}
 install -m644 setup/smbusers $RPM_BUILD_ROOT%{_sysconfdir}/samba/smbusers
 install -m644 setup/smb.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
-install -m755 source/client/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
-install -m755 source/client/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
+install -m755 bin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
+install -m755 bin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
 install -m755 source/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
 
 /bin/rm $RPM_BUILD_ROOT%{_sbindir}/*mount.cifs
diff --git a/source/VERSION b/source/VERSION
index d9ebec7..215af9e 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="ctdb"
+SAMBA_VERSION_VENDOR_SUFFIX=
 SAMBA_VERSION_VENDOR_PATCH=


-- 
SAMBA-CTDB repository