[SCM] Samba Shared Repository - branch master updated - 8f2e7041a0ab94db88b5693f48455724e76261c6

[Michael Adam]

The branch, master has been updated
       via  8f2e7041a0ab94db88b5693f48455724e76261c6 (commit)
       via  5b2d2ff9d8bb655e53e16982c9c7d49f6c759f6d (commit)
       via  b139ad71e39dce090889511c34603808f1f6f896 (commit)
      from  43d0a4813bf919e7fe6ab82f6920015d1a57f7bc (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8f2e7041a0ab94db88b5693f48455724e76261c6
Author: Michael Adam <obnox at samba.org>
Date:   Wed Dec 17 22:27:39 2008 +0100

    packaging(RHEL-CTDB): fix typo in [u]mount.cifs installation
    
    Michael
    (cherry picked from commit 835108bcf84a5f47f46d237c7a93c572348125a1)
    
    Signed-off-by: Michael Adam <obnox at samba.org>

commit 5b2d2ff9d8bb655e53e16982c9c7d49f6c759f6d
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
    (cherry picked from commit 96c811cf222be5463a6705feae73d6215685c5f1)
    
    Signed-off-by: Michael Adam <obnox at samba.org>

commit b139ad71e39dce090889511c34603808f1f6f896
Author: Michael Adam <obnox at samba.org>
Date:   Wed Dec 17 16:59:24 2008 +0100

    packaging(RHEL-CTDB): Fix accidential linebreak
    
    Michael
    (cherry picked from commit 5cd8ff8a2aba6b1d6821d4ebb986449b03d40542)
    
    Signed-off-by: Michael Adam <obnox at samba.org>

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

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


Changeset truncated at 500 lines:

diff --git a/packaging/RHEL-CTDB/makespec.sh b/packaging/RHEL-CTDB/makespec.sh
index 7d10d55..ae58db0 100755
--- a/packaging/RHEL-CTDB/makespec.sh
+++ b/packaging/RHEL-CTDB/makespec.sh
@@ -22,8 +22,7 @@ if [ ! -f ${VERSION_H} ] ; then
 fi
 
 VERSION=`grep SAMBA_VERSION_OFFICIAL_STRING ${VERSION_H} | awk '{print $3}'`
-vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX ${VERSION_H} | awk '{print
-$3}'`
+vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX ${VERSION_H} | awk '{print $3}'`
 if test "x${vendor_version}"  != "x" ; then
 	VERSION="${VERSION}-${vendor_version}"
 fi
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl
index 8a583a9..4806d9f 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -192,12 +192,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
@@ -257,8 +251,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 source/bin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
+install -m755 source/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


-- 
Samba Shared Repository