r5: merge in the SAMBA_3_0_RELEASE branch from cvs

to checkout try:

svn co svn+ssh://svn.samba.org/home/svn/samba/branches/SAMBA_3_0_RELEASE samba-3_0-release

metze

2 files changed, 14 insertions, 1 deletions

diff --git a/packaging/RedHat/samba.spec.tmpl b/packaging/RedHat/samba.spec.tmpl
index 787fe87d4ae..70d51e34437 100644
--- a/packaging/RedHat/samba.spec.tmpl
+++ b/packaging/RedHat/samba.spec.tmpl
@@ -160,6 +160,17 @@ make DESTDIR=$RPM_BUILD_ROOT \
 	installman installswat installdat installmodules
 cd ..
 
+## work around a temporary bug in the installswat script
+## copy the images
+mv docs/htmldocs/images $RPM_BUILD_ROOT/%{prefix}/share/swat/help
+
+## don't duplicate the docs.  These are installed with SWAT
+rm -rf docs/htmldocs
+rm -rf docs/manpages
+( cd docs; ln -s %{prefix}/share/swat/help htmldocs )
+
+
+
 # Install the nsswitch wins library
 install -m755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/lib
 ( cd $RPM_BUILD_ROOT/lib; ln -sf libnss_wins.so libnss_wins.so.2 )
diff --git a/packaging/RedHat/smb.conf b/packaging/RedHat/smb.conf
index 74806da16bb..cdc958bc0e0 100644
--- a/packaging/RedHat/smb.conf
+++ b/packaging/RedHat/smb.conf
@@ -43,7 +43,9 @@
 
 # this tells Samba to use a separate log file for each machine
 # that connects
-   log file = /var/log/samba/log.%m
+   # log file = /var/log/samba/log.%m
+# all log information in one file
+   log file = /var/log/samba/smbd.log
 
 # Put a capping on the size of the log files (in Kb).
    max log size = 50