Sync up packaging updates that didn't make it to HEAD.

(This used to be commit c6f7358535eb96112e055d60d39c1595601d3056)

1 files changed, 182 insertions, 139 deletions

diff --git a/packaging/PHT/TurboLinux/samba2.spec.tmpl b/packaging/PHT/TurboLinux/samba2.spec.tmpl
index 257159b759..668dddb0f6 100644
--- a/packaging/PHT/TurboLinux/samba2.spec.tmpl
+++ b/packaging/PHT/TurboLinux/samba2.spec.tmpl
@@ -7,11 +7,10 @@ Group: Networking
 Source: ftp://samba.org/pub/samba/samba-PVERSION.tar.gz
 Patch: makefile-path.patch
 Patch1: smbw.patch
-Patch2: nss_makefile.patch
 Requires: pam >= 0.64 kernel >= 2.2.1 glibc >= 2.1.2
 Prereq: chkconfig fileutils
 BuildRoot: /var/tmp/samba
-
+Prefix: /usr
 
 %package debugtools
 Version: PVERSION
@@ -35,11 +34,16 @@ in Linux. Samba uses NetBIOS over TCP/IP (NetBT) protocols
 and does NOT need NetBEUI (Microsoft Raw NetBIOS frame)
 protocol.
 
-Samba-2 features an mostly working NT Domain Control
-capability and includes the new SWAT (Samba Web Administration
-Tool) that allows samba's smb.conf file to be remotely managed
-using your favourite web browser. For the time being this is
-being enabled on TCP port 901 via inetd.
+Samba-2.2 features working NT Domain Control capability and 
+includes the SWAT (Samba Web Administration Tool) that 
+allows samba's smb.conf file to be remotely managed using your 
+favourite web browser. For the time being this is being
+enabled on TCP port 901 via inetd.
+
+Users are advised to use Samba-2.2 as a Windows NT4
+Domain Controller only on networks that do NOT have a Windows
+NT Domain Controller. This release does NOT as yet have
+Backup Domain control ability.
 
 Please refer to the WHATSNEW.txt document for fixup information.
 This binary release includes encrypted password support.
@@ -48,21 +52,38 @@ Please read the smb.conf file and ENCRYPTION.txt in the
 docs directory for implementation details.
 
 NOTE: TurboLinux uses PAM which has integrated support
-for Shadow passwords. Do NOT recompile with the SHADOW_PWD option
-enabled. TurboLinux has built in support for quotas in PAM.
+for Shadow passwords and quotas. Do NOT recompile with the
+SHADOW_PWD option enabled.
+
 
 %description -n smbfs
 This package includes the tools necessary to mount filesystems from
 SMB servers.
 
+Smbmount and smbumount are an interface to the SMB filesystem. Smbfs is
+a filesystem which understands the SMB protocol. This is the protocol
+Windows for Workgroups, Windows NT or Lan Manager use to talk to each
+other. It was inspired by samba, the program by Andrew Tridgell that
+turns any unix site into a file server for DOS or Windows clients. See
+http://samba.org/samba for this interesting program suite and lots of
+more information on SMB and NetBIOS over TCP/IP. There you also find
+explanation for conceps like NetBIOS name or share.
+
 %description debugtools
 This package contains programs that can be used to crash test any SMB
 server. Please use it with care. If you do not need it then do NOT
 install.
 
 %changelog
-* Mon Jul 17 2000 John H Terpstra <jht@turbolinux.com>
-- Start of Samba-3 packaging
+* Sat Nov 04 2000 John H Terpstra <jht@samba.org>
+- Put Symlink for libnss_wins.so back into main install section
+
+* Fri Nov  3 2000 Uros Prestor <uros@turbolinux.com>
+- ported to IA-64
+
+* Mon Oct 09 2000 John H Terpstra <jht@turbolinux.com>
+- Started move to Samba-2.2.0
+- Added nsswitch wins support
 
 * Mon May 29 2000 John H Terpstra <jht@turbolinux.com>
 - moved linkage of libnss_wins.so.2 to %post
@@ -149,28 +170,53 @@ install.
 
 * Sat Jan 24 1998 John H Terpstra <jht@samba.org>
  - Many optimisations (some suggested by Manoj Kasichainula <manojk@io.com>
-  - Use of chkconfig in place of individual symlinks to /etc/rc.d/init/smb
-  - Compounded make line
-  - Updated smb.init restart mechanism
-  - Use compound mkdir -p line instead of individual calls to mkdir
-  - Fixed smb.conf file path for log files
-  - Fixed smb.conf file path for incoming smb print spool directory
-  - Added a number of options to smb.conf file
-  - Added smbadduser command (missed from all previous RPMs) - Doooh!
-  - Added smbuser file and smb.conf file updates for username map
+ - Use of chkconfig in place of individual symlinks to /etc/rc.d/init/smb
+ - Compounded make line
+ - Updated smb.init restart mechanism
+ - Use compound mkdir -p line instead of individual calls to mkdir
+ - Fixed smb.conf file path for log files
+ - Fixed smb.conf file path for incoming smb print spool directory
+ - Added a number of options to smb.conf file
+ - Added smbadduser command (missed from all previous RPMs) - Doooh!
+ - Added smbuser file and smb.conf file updates for username map
 
 %prep
 %setup
 %patch -p1
 %patch1 -p1
-#%patch2 -p2
+
 
 %build
 cd source
+
+%ifarch ia64
+libtoolize --copy --force     # get it to recognize IA-64
+autoconf
+autoheader
+EXTRA="-D_LARGEFILE64_SOURCE"
+%endif
+
 NUMCPU=`grep processor /proc/cpuinfo | wc -l`
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=/etc --with-lockdir=/var/lock/samba --with-privatedir=/etc --with-swatdir=/usr/share/swat --with-automount --with-quotas --with-smbmount --with-pam --with-profile --with-utmp --with-netatalk --with-sambabook=/usr/share/swat/using_samba
-#make -j${NUMCPU} all smbtorture rpctorture smbfilter debug2html nsswitch/libnss_wins.so
-make -j${NUMCPU} all smbtorture smbfilter debug2html nsswitch/libnss_wins.so masktest locktest locktest2 smbwrapper nsswitch/libnss_wins.so bin/smbw_sample
+CFLAGS="$RPM_OPT_FLAGS $EXTRA" ./configure \
+	--prefix=%{prefix} \
+	--libdir=/etc \
+	--with-lockdir=/var/lock/samba \
+	--with-privatedir=/etc \
+	--with-swatdir=%{prefix}/share/swat \
+	--with-quotas \
+	--with-smbmount \
+	--with-pam \
+	--with-profile \
+	--with-syslog \
+	--with-utmp \
+	--with-vfs \
+	--with-msdfs \
+	--with-netatalk \
+	--with-sambabook=%{prefix}/share/swat/using_samba
+make -j${NUMCPU} all smbfilter nsswitch/libnss_wins.so
+make -j${NUMCPU} smbtorture debug2html locktest2
+make -j${NUMCPU} masktest bin/smbspool
+#make -j${NUMCPU} rpctorture locktest smbwrapper bin/wbinfo
 
 
 %install
@@ -181,46 +227,39 @@ mkdir -p $RPM_BUILD_ROOT/etc/{logrotate.d,pam.d}
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
 mkdir -p $RPM_BUILD_ROOT/lib
 mkdir -p $RPM_BUILD_ROOT/home/samba
-mkdir -p $RPM_BUILD_ROOT/usr/{bin,sbin}
-mkdir -p $RPM_BUILD_ROOT/usr/share/swat/using_samba/{gifs,figs}
-mkdir -p $RPM_BUILD_ROOT/usr/share/swat/{images,help,include}
-mkdir -p $RPM_BUILD_ROOT/usr/share/man/{man1,man5,man7,man8}
+mkdir -p $RPM_BUILD_ROOT%{prefix}/{bin,sbin}
+mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/using_samba/{gifs,figs}
+mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/{images,help,include}
+mkdir -p $RPM_BUILD_ROOT%{prefix}/share/man/{man1,man5,man7,man8}
 mkdir -p $RPM_BUILD_ROOT/var/lock/samba
 mkdir -p $RPM_BUILD_ROOT/var/log/samba
 mkdir -p $RPM_BUILD_ROOT/var/spool/samba
 
 # Install standard binary files
-# At a later date add smbsh and smbwrapper.so back into line below
 for i in nmblookup smbclient smbpasswd smbstatus testparm testprns \
-      make_smbcodepage make_unicodemap make_printerdef \
-      smbfilter smbsh smbspool smbw_sample smbwrapper.so
+      make_smbcodepage make_unicodemap make_printerdef rpcclient smbspool
+#      smbsh smbwrapper.so 
 do
-install -m755 -s source/bin/$i $RPM_BUILD_ROOT/usr/bin
+install -m755 -s source/bin/$i $RPM_BUILD_ROOT%{prefix}/bin
 done
 for i in addtosmbpass mksmbpasswd.sh smbtar
 do
-install -m755 source/script/$i $RPM_BUILD_ROOT/usr/bin
+install -m755 source/script/$i $RPM_BUILD_ROOT%{prefix}/bin
 done
 
 # Install secure binary files
-for i in smbd nmbd swat smbmount smbumount smbmnt debug2html smbtorture masktest \
-       locktest locktest2
+for i in smbd nmbd swat smbmount smbumount smbmnt debug2html \
+      smbtorture smbfilter locktest2 masktest
+#     wbinfo
 do
 install -m755 -s source/bin/$i $RPM_BUILD_ROOT/usr/sbin
 done
 
-# Install level 1 man pages
-for i in smbclient.1 smbrun.1 smbstatus.1 smbtar.1 testparm.1 testprns.1 \
-      make_smbcodepage.1 make_unicodemap.1 nmblookup.1 wbinfo.1
-do
-install -m644 docs/manpages/$i $RPM_BUILD_ROOT/usr/share/man/man1
-done
 
-# Install level 8 man pages
-for i in nmbd.8 smbd.8 smbmnt.8 smbmount.8 smbpasswd.8 smbspool.8 \
-      smbumount.8 swat.8 winbindd.8
+# Install level 1 man pages
+for i in *.1
 do
-install -m644 docs/manpages/$i $RPM_BUILD_ROOT/usr/share/man/man8
+install -m644 docs/manpages/$i $RPM_BUILD_ROOT%{prefix}/share/man/man1
 done
 
 # Install codepage source files
@@ -235,57 +274,65 @@ done
 
 # Install the nsswitch library extension file
 install -m755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/lib
+# Make link for wins resolver
+( cd $RPM_BUILD_ROOT/lib; ln -s libnss_wins.so libnss_wins.so.2; )
 
 # Install SWAT helper files
-for i in swat/help/*.html
-do
-cat $i | sed 's/@BOOKDIR@//' > $RPM_BUILD_ROOT/usr/share/$i
-chmod 644 $RPM_BUILD_ROOT/usr/share/$i
-done
-for i in docs/htmldocs/*.html
+for i in swat/help/*.html docs/htmldocs/*.html
 do
-install -m644 $i $RPM_BUILD_ROOT/usr/share/swat/help
+install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/help
 done
 for i in swat/images/*.gif
 do
-install -m644 $i $RPM_BUILD_ROOT/usr/share/swat/images
+install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/images
 done
 for i in swat/include/*.html
 do
-install -m644 $i $RPM_BUILD_ROOT/usr/share/swat/include
+install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/include
 done
 
 # This is the O'Reily Samba Book - on-line
 for i in docs/htmldocs/using_samba/*.html
 do
-install -m644 $i $RPM_BUILD_ROOT/usr/share/swat/using_samba
+install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/using_samba
 done
 for i in docs/htmldocs/using_samba/figs/*.gif
 do
-install -m644 $i $RPM_BUILD_ROOT/usr/share/swat/using_samba/figs
+install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/using_samba/figs
 done
 for i in docs/htmldocs/using_samba/gifs/*.gif
 do
-install -m644 $i $RPM_BUILD_ROOT/usr/share/swat/using_samba/gifs
+install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/using_samba/gifs
 done
 
 # Install the miscellany
-install -m644 swat/README $RPM_BUILD_ROOT/usr/share/swat
-install -m644 docs/manpages/smb.conf.5 $RPM_BUILD_ROOT/usr/share/man/man5
-install -m644 docs/manpages/lmhosts.5 $RPM_BUILD_ROOT/usr/share/man/man5
-install -m644 docs/manpages/smbpasswd.5 $RPM_BUILD_ROOT/usr/share/man/man5
-install -m644 docs/manpages/samba.7 $RPM_BUILD_ROOT/usr/share/man/man7
+install -m644 swat/README $RPM_BUILD_ROOT%{prefix}/share/swat
+install -m644 docs/manpages/smb.conf.5 $RPM_BUILD_ROOT%{prefix}/share/man/man5
+install -m644 docs/manpages/lmhosts.5 $RPM_BUILD_ROOT%{prefix}/share/man/man5
+install -m644 docs/manpages/smbpasswd.5 $RPM_BUILD_ROOT%{prefix}/share/man/man5
+install -m644 docs/manpages/samba.7 $RPM_BUILD_ROOT%{prefix}/share/man/man7
+install -m644 docs/manpages/smbd.8 $RPM_BUILD_ROOT%{prefix}/share/man/man8
+install -m644 docs/manpages/nmbd.8 $RPM_BUILD_ROOT%{prefix}/share/man/man8
+install -m644 docs/manpages/smbpasswd.8 $RPM_BUILD_ROOT%{prefix}/share/man/man8
+install -m644 docs/manpages/swat.8 $RPM_BUILD_ROOT%{prefix}/share/man/man8
+install -m644 docs/manpages/smbmount.8 $RPM_BUILD_ROOT%{prefix}/share/man/man8
+install -m644 docs/manpages/smbmnt.8 $RPM_BUILD_ROOT%{prefix}/share/man/man8
+install -m644 docs/manpages/smbumount.8 $RPM_BUILD_ROOT%{prefix}/share/man/man8
 install -m644 packaging/PHT/TurboLinux/smb.conf $RPM_BUILD_ROOT/etc/smb.conf
 install -m644 packaging/PHT/TurboLinux/smbusers $RPM_BUILD_ROOT/etc/smbusers
-install -m755 packaging/PHT/TurboLinux/smbprint $RPM_BUILD_ROOT/usr/bin
-install -m755 packaging/PHT/TurboLinux/findsmb $RPM_BUILD_ROOT/usr/bin
-install -m755 packaging/PHT/TurboLinux/smbadduser $RPM_BUILD_ROOT/usr/bin
+install -m755 packaging/PHT/TurboLinux/smbprint $RPM_BUILD_ROOT%{prefix}/bin
+install -m755 packaging/PHT/TurboLinux/findsmb $RPM_BUILD_ROOT%{prefix}/bin
+install -m755 packaging/PHT/TurboLinux/smbadduser $RPM_BUILD_ROOT%{prefix}/bin
 install -m755 packaging/PHT/TurboLinux/smb.init $RPM_BUILD_ROOT/etc/rc.d/init.d/smb
-install -m755 packaging/PHT/TurboLinux/smb.init $RPM_BUILD_ROOT/usr/sbin/samba
+install -m755 packaging/PHT/TurboLinux/smb.init $RPM_BUILD_ROOT%{prefix}/sbin/samba
 install -m644 packaging/PHT/TurboLinux/samba.pamd $RPM_BUILD_ROOT/etc/pam.d/samba
 install -m644 packaging/PHT/TurboLinux/samba.log $RPM_BUILD_ROOT/etc/logrotate.d/samba
 echo 127.0.0.1 localhost > $RPM_BUILD_ROOT/etc/lmhosts
 
+# Link smbmount to /sbin/mount.smb and /sbin/mount.smbfs
+ln -sf %{prefix}/sbin/smbmount $RPM_BUILD_ROOT/sbin/mount.smb
+ln -sf %{prefix}/sbin/smbmount $RPM_BUILD_ROOT/sbin/mount.smbfs
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -293,20 +340,15 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/chkconfig --add smb
 /sbin/chkconfig smb off
 
-# Link smbmount to /sbin/mount.smb
-if [ ! -f /sbin/mount.smb ]; then
-	ln -s /usr/sbin/smbmount /sbin/mount.smb
-fi
-
 # Build codepage load files
 cd /etc
 for i in 437 737 775 850 852 861 866 932 936 949 950 1251
 do
-/usr/bin/make_smbcodepage c $i /etc/codepages/src/codepage_def.$i /etc/codepages/codepage.$i
+%{prefix}/bin/make_smbcodepage c $i /etc/codepages/src/codepage_def.$i /etc/codepages/codepage.$i
 done
 for i in 437 737 850 852 861 866 932 936 949 950 ISO8859-1 ISO8859-2 ISO8859-5 ISO8859-7 KOI8-R
 do
-/usr/bin/make_unicodemap $i /etc/codepages/src/CP$i.TXT /etc/codepages/unicode_map.$i
+%{prefix}/bin/make_unicodemap $i /etc/codepages/src/CP$i.TXT /etc/codepages/unicode_map.$i
 done
 
 # Add swat entry to /etc/services if not already there
@@ -316,7 +358,7 @@ fi
 
 # Add swat entry to /etc/inetd.conf if needed
 if !( grep ^[:space:]*swat /etc/inetd.conf > /dev/null ) then
-        echo '#swat      stream  tcp     nowait.400      root    /usr/sbin/swat swat' >> /etc/inetd.conf
+        echo '#swat      stream  tcp     nowait.400      root    %{prefix}/sbin/swat swat' >> /etc/inetd.conf
 	killall -1 inetd || :
 fi
 
@@ -325,8 +367,7 @@ if [ -f /etc/xinetd.conf ]; then
 	mv /etc/xinetd.conf /etc/xinetd.conf.presamba
 	/usr/sbin/itox --daemon_dir /usr/sbin < /etc/inetd.conf > /etc/xinetd.conf
 fi
-# Make link for wins resolver
-ln -s /lib/libnss_wins.so /lib/libnss_wins.so.2
+
 
 %preun
 if [ $1 = 0 ] ; then
@@ -364,6 +405,8 @@ if [ $1 = 0 ] ; then
     tmpfile=/etc/tmp.$$
     sed -e '/^[:space:]*swat.*$/d' /etc/inetd.conf > $tmpfile
     mv $tmpfile inetd.conf
+    sed -e '/#swat.*$/d' /etc/inetd.conf > $tmpfile
+    mv $tmpfile inetd.conf
     sed -e '/^[:space:]*swat.*$/d' /etc/services > $tmpfile
     mv $tmpfile services
 
@@ -371,10 +414,7 @@ if [ $1 = 0 ] ; then
     mv /etc/xinetd.conf /etc/xinetd.conf.samba
     /usr/sbin/itox --daemon_dir /usr/sbin < /etc/inetd.conf > /etc/xinetd.conf
 fi
-if [ -f /sbin/mount.smb ]; then
-	rm -f /sbin/mount.smb
-fi
-rm -f /lib/libnss_wins.so.2
+
 
 %triggerpostun -- samba < samba-2.0.0
 if [ $0 != 0 ]; then
@@ -388,36 +428,35 @@ fi
 %doc docs
 %doc swat/README
 %doc examples
-%attr(-,root,root) /usr/sbin/smbd
-%attr(-,root,root) /usr/sbin/nmbd
-%attr(-,root,root) /usr/sbin/swat
-%attr(0750,root,root) /usr/sbin/samba
-%attr(-,root,root) /usr/bin/addtosmbpass
-%attr(-,root,root) /usr/bin/mksmbpasswd.sh
-%attr(-,root,root) /usr/bin/smbclient
-#%attr(-,root,root) /usr/bin/rpcclient
-%attr(-,root,root) /usr/bin/testparm
-%attr(-,root,root) /usr/bin/testprns
-%attr(-,root,root) /usr/bin/findsmb
-%attr(-,root,root) /usr/bin/smbstatus
-%attr(-,root,root) /usr/bin/nmblookup
-%attr(-,root,root) /usr/bin/make_smbcodepage
-%attr(-,root,root) /usr/bin/make_unicodemap
-%attr(-,root,root) /usr/bin/make_printerdef
-%attr(-,root,root) /usr/bin/smbpasswd
-%attr(-,root,root) /usr/bin/smbtar
-%attr(-,root,root) /usr/bin/smbprint
-%attr(-,root,root) /usr/bin/smbadduser
-%attr(-,root,root) /usr/bin/smbfilter
-%attr(-,root,root) /usr/bin/smbspool
-%attr(0755,root,root) /usr/bin/smbsh
-%attr(0755,root,root) /usr/bin/smbwrapper.so
-%attr(755,root,root) /lib/libnss_wins.so
-%attr(-,root,root) /usr/share/swat/help/*
-%attr(-,root,root) /usr/share/swat/images/*
-%attr(-,root,root) /usr/share/swat/include/header.html
-%attr(-,root,root) /usr/share/swat/include/footer.html
-%attr(-,root,root) /usr/share/swat/using_samba/*
+%attr(-,root,root) %{prefix}/sbin/smbd
+%attr(-,root,root) %{prefix}/sbin/nmbd
+%attr(-,root,root) %{prefix}/sbin/swat
+%attr(0750,root,root) %{prefix}/sbin/samba
+%attr(-,root,root) %{prefix}/bin/addtosmbpass
+%attr(-,root,root) %{prefix}/bin/mksmbpasswd.sh
+%attr(-,root,root) %{prefix}/bin/smbclient
+%attr(-,root,root) %{prefix}/bin/rpcclient
+%attr(-,root,root) %{prefix}/bin/testparm
+%attr(-,root,root) %{prefix}/bin/testprns
+%attr(-,root,root) %{prefix}/bin/findsmb
+%attr(-,root,root) %{prefix}/bin/smbstatus
+%attr(-,root,root) %{prefix}/bin/nmblookup
+%attr(-,root,root) %{prefix}/bin/make_smbcodepage
+%attr(-,root,root) %{prefix}/bin/make_unicodemap
+%attr(-,root,root) %{prefix}/bin/make_printerdef
+%attr(-,root,root) %{prefix}/bin/smbpasswd
+%attr(-,root,root) %{prefix}/bin/smbtar
+%attr(-,root,root) %{prefix}/bin/smbprint
+%attr(-,root,root) %{prefix}/bin/smbspool
+%attr(-,root,root) %{prefix}/bin/smbadduser
+# %attr(0755,root,root) %{prefix}/bin/smbsh
+# %attr(0755,root,root) %{prefix}/bin/smbwrapper.so
+%attr(755,root,root) /lib/libnss_wins.s*
+%attr(-,root,root) %{prefix}/share/swat/help/*
+%attr(-,root,root) %{prefix}/share/swat/images/*
+%attr(-,root,root) %{prefix}/share/swat/include/header.html
+%attr(-,root,root) %{prefix}/share/swat/include/footer.html
+%attr(-,root,root) %{prefix}/share/swat/using_samba/*
 %attr(-,root,root) %config(noreplace) /etc/lmhosts
 %attr(-,root,root) %config(noreplace) /etc/smb.conf
 %attr(-,root,root) %config(noreplace) /etc/smbusers
@@ -426,22 +465,24 @@ fi
 %attr(-,root,root) /etc/pam.d/samba
 %attr(-,root,root) /etc/codepages/src/codepage_def.*
 %attr(-,root,root) /etc/codepages/src/CP*
-%attr(-,root,root) /usr/share/man/man1/smbstatus.1
-%attr(-,root,root) /usr/share/man/man1/nmblookup.1
-%attr(-,root,root) /usr/share/man/man1/smbclient.1
-%attr(-,root,root) /usr/share/man/man1/make_smbcodepage.1
-%attr(-,root,root) /usr/share/man/man1/make_unicodemap.1
-%attr(-,root,root) /usr/share/man/man1/smbrun.1
-%attr(-,root,root) /usr/share/man/man1/smbsh.1
-%attr(-,root,root) /usr/share/man/man1/smbtar.1
-%attr(-,root,root) /usr/share/man/man1/testparm.1
-%attr(-,root,root) /usr/share/man/man1/testprns.1
-%attr(-,root,root) /usr/share/man/man5/smb.conf.5
-%attr(-,root,root) /usr/share/man/man7/samba.7
-%attr(-,root,root) /usr/share/man/man8/smbd.8
-%attr(-,root,root) /usr/share/man/man8/nmbd.8
-%attr(-,root,root) /usr/share/man/man8/swat.8
-%attr(-,root,root) /usr/share/man/man8/smbpasswd.8
+# %attr(-,root,root) %{prefix}/share/man/man1/smbsh.1
+%attr(-,root,root) %{prefix}/share/man/man1/make_smbcodepage.1
+%attr(-,root,root) %{prefix}/share/man/man1/make_unicodemap.1
+%attr(-,root,root) %{prefix}/share/man/man1/nmblookup.1
+%attr(-,root,root) %{prefix}/share/man/man1/smbclient.1
+%attr(-,root,root) %{prefix}/share/man/man1/smbrun.1
+%attr(-,root,root) %{prefix}/share/man/man1/smbstatus.1
+%attr(-,root,root) %{prefix}/share/man/man1/smbtar.1
+%attr(-,root,root) %{prefix}/share/man/man1/testparm.1
+%attr(-,root,root) %{prefix}/share/man/man1/testprns.1
+%attr(-,root,root) %{prefix}/share/man/man5/lmhosts.5
+%attr(-,root,root) %{prefix}/share/man/man5/smb.conf.5
+%attr(-,root,root) %{prefix}/share/man/man5/smbpasswd.5
+%attr(-,root,root) %{prefix}/share/man/man7/samba.7
+%attr(-,root,root) %{prefix}/share/man/man8/nmbd.8
+%attr(-,root,root) %{prefix}/share/man/man8/smbd.8
+%attr(-,root,root) %{prefix}/share/man/man8/smbpasswd.8
+%attr(-,root,root) %{prefix}/share/man/man8/swat.8
 %attr(-,root,nobody) %dir /home/samba
 %attr(-,root,root) %dir /etc/codepages
 %attr(-,root,root) %dir /etc/codepages/src
@@ -450,18 +491,20 @@ fi
 %attr(1777,root,root) %dir /var/spool/samba
 
 %files -n smbfs
-%attr(-,root,root) /usr/sbin/smbmount
-%attr(-,root,root) /usr/sbin/smbumount
-%attr(-,root,root) /usr/sbin/smbmnt
-%attr(-,root,root) /usr/share/man/man8/smbmnt.8
-%attr(-,root,root) /usr/share/man/man8/smbmount.8
-%attr(-,root,root) /usr/share/man/man8/smbumount.8
+%attr(-,root,root) %{prefix}/sbin/smbmount
+%attr(-,root,root) %{prefix}/sbin/smbumount
+%attr(-,root,root) %{prefix}/sbin/smbmnt
+%attr(-,root,root) /sbin/mount.smb
+%attr(-,root,root) /sbin/mount.smbfs
+%attr(-,root,root) %{prefix}/share/man/man8/smbmnt.8
+%attr(-,root,root) %{prefix}/share/man/man8/smbmount.8
+%attr(-,root,root) %{prefix}/share/man/man8/smbumount.8
 
 %files debugtools
-%attr(-,root,root) /usr/sbin/smbtorture
-%attr(-,root,root) /usr/sbin/smbfilter
-%attr(-,root,root) /usr/sbin/debug2html
-%attr(-,root,root) /usr/sbin/locktest
-%attr(-,root,root) /usr/sbin/locktest2
-%attr(-,root,root) /usr/sbin/masktest
-%attr(-,root,root) /usr/sbin/smbw_sample
+%attr(-,root,root) %{prefix}/sbin/smbtorture
+#%attr(-,root,root) %{prefix}/sbin/rpctorture
+%attr(-,root,root) %{prefix}/sbin/smbfilter
+%attr(-,root,root) %{prefix}/sbin/debug2html
+%attr(-,root,root) %{prefix}/sbin/locktest2
+#%attr(-,root,root) %{prefix}/sbin/wbinfo
+%attr(-,root,root) %{prefix}/sbin/masktest