svn commit: samba r11059 - in trunk/packaging/Fedora: .

jerry at samba.org jerry at samba.org
Fri Oct 14 16:05:51 GMT 2005


Author: jerry
Date: 2005-10-14 16:05:51 +0000 (Fri, 14 Oct 2005)
New Revision: 11059

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11059

Log:
merging spec file updates from 3.0 tree
Modified:
   trunk/packaging/Fedora/samba.spec.tmpl


Changeset:
Modified: trunk/packaging/Fedora/samba.spec.tmpl
===================================================================
--- trunk/packaging/Fedora/samba.spec.tmpl	2005-10-14 15:55:51 UTC (rev 11058)
+++ trunk/packaging/Fedora/samba.spec.tmpl	2005-10-14 16:05:51 UTC (rev 11059)
@@ -125,9 +125,13 @@
 	--enable-cups=yes
 make showlayout
 make proto
-make %{?_smp_mflags} all modules nsswitch/libnss_wins.so debug2html 
+make %{?_smp_mflags} all modules nsswitch/libnss_wins.so 
 
+## build the cifs fs mount helper
+gcc  -o mount.cifs $RPM_OPT_FLAGS -Wall -D_GNU_SOURCE -D_LARGEFILE64_SOURCE client/mount.cifs.c
+gcc  -o umount.cifs $RPM_OPT_FLAGS -Wall -D_GNU_SOURCE -D_LARGEFILE64_SOURCE client/umount.cifs.c
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -153,6 +157,8 @@
 install -m644 %{SOURCE7} $RPM_BUILD_ROOT/etc/pam.d/samba
 install -m644 %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/samba
 install -m755 source/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
+install -m755 source/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
+install -m755 source/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
 
 install -m755 %{SOURCE5} $RPM_BUILD_ROOT%{initdir}/smb
 install -m755 %{SOURCE6} $RPM_BUILD_ROOT%{initdir}/winbind
@@ -204,8 +210,6 @@
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/smbsh.1*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/smbget.1*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man5/smbgetrc.5*
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/mount.cifs.8*
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/umount.cifs.8*
 rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/testprns.1*
 
 %clean
@@ -311,6 +315,8 @@
 %defattr(-,root,root)
 /sbin/mount.smb
 /sbin/mount.smbfs
+/sbin/mount.cifs
+/sbin/umount.cifs
 %{_libdir}/samba/lowcase.dat
 %{_libdir}/samba/upcase.dat
 %{_libdir}/samba/valid.dat
@@ -325,6 +331,8 @@
 %{_mandir}/man8/smbmnt.8*
 %{_mandir}/man8/smbmount.8*
 %{_mandir}/man8/smbumount.8*
+%{_mandir}/man8/mount.cifs.8.*
+%{_mandir}/man8/umount.cifs.8.*
 %{_mandir}/man8/smbspool.8*
 %{_bindir}/nmblookup
 %{_bindir}/smbclient



More information about the samba-cvs mailing list