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

[Karolin Seeger]

The branch, v3-2-test has been updated
       via  b17132c61c22962fc30747f4619d32d0be608272 (commit)
       via  6dbaf86ba4119a4fe2b2aea56994c3d3ea5d8428 (commit)
      from  b2ef64515d4a4876276d152ff2075546d2030d23 (commit)

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


- Log -----------------------------------------------------------------
commit b17132c61c22962fc30747f4619d32d0be608272
Author: Karolin Seeger <kseeger at samba.org>
Date:   Fri Jan 2 14:51:23 2009 +0100

    Revert "packaging(RHEL): fix build of [u]mount.cifs"
    
    This reverts commit cd796359ec0c30a0204fe744805bfbea3550f57d.
    
    Applies only for 3.3 series.
    
    Karolin

commit 6dbaf86ba4119a4fe2b2aea56994c3d3ea5d8428
Author: Karolin Seeger <kseeger at samba.org>
Date:   Fri Jan 2 14:50:14 2009 +0100

    Revert "packaging(RHEL): fix typo in [u]mount.cifs installation"
    
    This reverts commit b2ef64515d4a4876276d152ff2075546d2030d23.
    
    This issue does apply for 3.3 series only.
    
    Karolin

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

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


Changeset truncated at 500 lines:

diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index a93b5d9..49a0109 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -179,6 +179,12 @@ 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
@@ -245,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/bin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
-install -m755 source/bin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
+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/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
 
 /bin/rm $RPM_BUILD_ROOT%{_sbindir}/*mount.cifs


-- 
Samba Shared Repository