summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-10-13 12:35:33 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:04:58 -0500
commit1aa8721e30aebd7712c9c27d5640526881819c6d (patch)
tree74bff49111fd370f62964d16948469cfb3e0f6c5
parent4a190ec27bf69f849f22daf3060841f9a1c92b4f (diff)
downloadsamba-1aa8721e30aebd7712c9c27d5640526881819c6d.tar.gz
samba-1aa8721e30aebd7712c9c27d5640526881819c6d.tar.bz2
samba-1aa8721e30aebd7712c9c27d5640526881819c6d.zip
r10960: merging changes to specfile from 3.0.20b release
(This used to be commit f07b38f408af90623763cce890bd72f37de52d69)
-rw-r--r--packaging/Fedora/samba.spec.tmpl9
1 files changed, 7 insertions, 2 deletions
diff --git a/packaging/Fedora/samba.spec.tmpl b/packaging/Fedora/samba.spec.tmpl
index b2bfffff74..a5da445053 100644
--- a/packaging/Fedora/samba.spec.tmpl
+++ b/packaging/Fedora/samba.spec.tmpl
@@ -128,7 +128,8 @@ make proto
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
+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
@@ -156,7 +157,8 @@ install -m755 %{SOURCE8} $RPM_BUILD_ROOT%{_bindir}
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/client/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
+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
@@ -314,6 +316,7 @@ fi
/sbin/mount.smb
/sbin/mount.smbfs
/sbin/mount.cifs
+/sbin/umount.cifs
%{_libdir}/samba/lowcase.dat
%{_libdir}/samba/upcase.dat
%{_libdir}/samba/valid.dat
@@ -328,6 +331,8 @@ fi
%{_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