[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3335-g9995378

[Karolin Seeger]

The branch, v3-2-test has been updated
       via  9995378cf3f28af183030c3867513552d85bf935 (commit)
       via  c93a5131913a1a18645c4f972be6f6b2c1715f28 (commit)
      from  4af1d077915c7bbe5268b78bde71b102861a2b98 (commit)

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


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

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

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

    packaging(RHEL): 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>
    (cherry picked from commit 308dbca653ce1d689b75f9b781237c67df4233a8)
    (cherry picked from commit 9745e36c011a76669aad7a0a861ba1520ef8cec3)
    (cherry picked from commit 1c1e196b648ae3ef241401f859842450c5153181)

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

Summary of changes:
 packaging/RHEL/samba.spec.tmpl |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index 49a0109..a93b5d9 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -179,12 +179,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
@@ -251,8 +245,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