Updated packaging files from 2.0.0 branch - NOTE: Not yet operative.

I will update these when 2.0.0beta3 has shipped. <John H Terpstra>
(This used to be commit a6d3601cc687b59afb346502488a2e74f2f737a9)

2 files changed, 38 insertions, 31 deletions

diff --git a/packaging/RedHat/makefile-path.patch b/packaging/RedHat/makefile-path.patch
index 98ab8e1997..37cf817d0d 100644
--- a/packaging/RedHat/makefile-path.patch
+++ b/packaging/RedHat/makefile-path.patch
@@ -1,43 +1,34 @@
---- samba-2.0.0/source/Makefile.in.orig	Wed Nov 18 09:58:38 1998
-+++ samba-2.0.0/source/Makefile.in	Wed Nov 18 23:32:58 1998
-@@ -24,7 +24,7 @@
+--- samba-2.0.0/source/Makefile.in.orig	Tue Dec  1 22:32:20 1998
++++ samba-2.0.0/source/Makefile.in	Wed Dec  2 17:11:33 1998
+@@ -25,9 +25,9 @@
  BINDIR = @bindir@
- SBINDIR = @sbindir@
+ # we don't use sbindir because we want full compatibility with
+ # the previous releases of Samba
+-SBINDIR = @bindir@
++SBINDIR = @sbindir@
  LIBDIR = @libdir@
--VARDIR = $(BASEDIR)/var
-+VARDIR = /var
+-VARDIR = @localstatedir@
++VARDIR = /var/log/samba
  MANDIR = @mandir@
  
  # The permissions to give the executables
-@@ -33,23 +33,23 @@
- # set these to where to find various files
- # These can be overridden by command line switches (see smbd(8))
- # or in smb.conf (see smb.conf(5))
--SMBLOGFILE = $(VARDIR)/log.smb
--NMBLOGFILE = $(VARDIR)/log.nmb
-+SMBLOGFILE = $(VARDIR)/log/samba/log.smb
-+NMBLOGFILE = $(VARDIR)/log/samba/log.nmb
- CONFIGFILE = $(LIBDIR)/smb.conf
- LMHOSTSFILE = $(LIBDIR)/lmhosts
+@@ -43,16 +43,16 @@
  DRIVERFILE = $(LIBDIR)/printers.def
  PASSWD_PROGRAM = /bin/passwd
--SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd
--SMB_PASSGRP_FILE = $(BASEDIR)/private/smbpassgrp
--SMB_GROUP_FILE = $(BASEDIR)/private/smbgroup
--SMB_ALIAS_FILE = $(BASEDIR)/private/smbalias
-+SMB_PASSWD_FILE = $(LIBDIR)/smbpasswd
-+SMB_PASSGRP_FILE = $(LIBDIR)/smbpassgrp
-+SMB_GROUP_FILE = $(LIBDIR)/smbgroup
-+SMB_ALIAS_FILE = $(LIBDIR)/smbalias
- SMB_PASSWD_PROGRAM = $(BASEDIR)/bin/smbpasswd
+ # This is where smbpasswd et al go
+-PRIVATEDIR = @privatedir@
++PRIVATEDIR = $(LIBDIR)
+ 
+ SMB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd
+ SMB_PASSGRP_FILE = $(PRIVATEDIR)/smbpassgrp
  
  # This is where SWAT images and help files go
--SWATDIR = $(BASEDIR)/swat
-+SWATDIR = $(BASEDIR)/share/swat
+-SWATDIR = @swatdir@
++SWATDIR = /usr/share/swat
  
  # the directory where lock files go
 -LOCKDIR = $(VARDIR)/locks
-+LOCKDIR = $(VARDIR)/lock/samba
++LOCKDIR = /var/lock/samba
  
  # The directory where code page definition files go
  CODEPAGEDIR = $(LIBDIR)/codepages
diff --git a/packaging/RedHat/samba2.spec.tmpl b/packaging/RedHat/samba2.spec.tmpl
index ab7276815e..c7d665c672 100644
--- a/packaging/RedHat/samba2.spec.tmpl
+++ b/packaging/RedHat/samba2.spec.tmpl
@@ -75,7 +75,7 @@ enabled. Red Hat Linux has built in support for quotas in PAM.
  - Updated spec file
  - Included new codepage.936
 
-* Sat Mar 20 1998 John H Terpstra <jht@samba.org>
+* Sat Mar 20 1998 John H Terpstra <jht@samba.anu.edu/au>
  - Added swat facility
 
 * Sat Jan 24 1998 John H Terpstra <jht@samba.org>
@@ -144,7 +144,7 @@ install -m644 source/codepages/codepage_def.$i $RPM_BUILD_ROOT/etc/codepages/src
 done
 
 # Install SWAT helper files
-for i in swat/help/*.html
+for i in swat/help/*.html docs/htmldocs/*.html
 do
 install -m644 $i $RPM_BUILD_ROOT/usr/share/swat/help
 done
@@ -277,8 +277,24 @@ fi
 %attr(-,root,root) /usr/bin/smbadduser
 %attr(0755,root,root) /usr/bin/smbsh
 %attr(0755,root,root) /usr/bin/smbwrapper.so
-%attr(-,root,root) /usr/share/swat/help/smb.conf.5.html
 %attr(-,root,root) /usr/share/swat/help/welcome.html
+%attr(-,root,root) /usr/share/swat/help/DOMAIN_MEMBER.html
+%attr(-,root,root) /usr/share/swat/help/lmhosts.5.html
+%attr(-,root,root) /usr/share/swat/help/make_smbcodepage.1.html
+%attr(-,root,root) /usr/share/swat/help/nmbd.8.html
+%attr(-,root,root) /usr/share/swat/help/nmblookup.1.html
+%attr(-,root,root) /usr/share/swat/help/samba.7.html
+%attr(-,root,root) /usr/share/swat/help/smb.conf.5.html
+%attr(-,root,root) /usr/share/swat/help/smbclient.1.html
+%attr(-,root,root) /usr/share/swat/help/smbd.8.html
+%attr(-,root,root) /usr/share/swat/help/smbpasswd.5.html
+%attr(-,root,root) /usr/share/swat/help/smbpasswd.8.html
+%attr(-,root,root) /usr/share/swat/help/smbrun.1.html
+%attr(-,root,root) /usr/share/swat/help/smbstatus.1.html
+%attr(-,root,root) /usr/share/swat/help/smbtar.1.html
+%attr(-,root,root) /usr/share/swat/help/swat.8.html
+%attr(-,root,root) /usr/share/swat/help/testparm.1.html
+%attr(-,root,root) /usr/share/swat/help/testprns.1.html
 %attr(-,root,root) /usr/share/swat/images/globals.gif
 %attr(-,root,root) /usr/share/swat/images/home.gif
 %attr(-,root,root) /usr/share/swat/images/passwd.gif