JHT ==> Updating RPM build file, more expected - so please ignore!

(This used to be commit 4fd3f5e26695fb8f2756a72dc1318486c8bc3ade)

2 files changed, 86 insertions, 125 deletions

diff --git a/examples/redhat/samba-make.patch b/examples/redhat/samba-make.patch
index 81797baf0e..cf9641949d 100644
--- a/examples/redhat/samba-make.patch
+++ b/examples/redhat/samba-make.patch
@@ -1,121 +1,81 @@
-*** samba-1.9.17a1/source/Makefile.orig	Sun May 11 22:44:55 1997
---- samba-1.9.17a1/source/Makefile	Sun May 11 22:51:53 1997
-***************
-*** 5,20 ****
-  
-  # The base manpages directory to put the man pages in
-  # Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist.
-! MANDIR = /usr/local/man
-  
-  # The directories to put things in. If you use multiple
-  # architectures or share the samba binaries across NFS then
-  # you will probably want to change this layout.
-! BASEDIR = /usr/local/samba
-! BINDIR = /usr/local/bin
-! SBINDIR = $(BASEDIR)/bin
-! LIBDIR = $(BASEDIR)/lib
-! VARDIR = $(BASEDIR)/var
-  
-  # The permissions to give the executables
-  INSTALLPERMS = 0755
---- 5,20 ----
-  
-  # The base manpages directory to put the man pages in
-  # Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist.
-! MANDIR = /usr/man
-  
-  # The directories to put things in. If you use multiple
-  # architectures or share the samba binaries across NFS then
-  # you will probably want to change this layout.
-! BASEDIR = /usr
-! BINDIR = $(BASEDIR)/bin
-! SBINDIR = $(BASEDIR)/sbin
-! LIBDIR = /etc
-! VARDIR = /var/log
-  
-  # The permissions to give the executables
-  INSTALLPERMS = 0755
-***************
-*** 23,35 ****
-  # add -DSYSLOG for syslog support
-  # RPM_OPT_FLAGS is needed when building an RPM distribution package
-  # for RedHat Linux.
-! # FLAGS1 = $(RPM_OPT_FLAGS)
-! FLAGS1 = -O
-  LIBS1 = 
-  
-  # You will need to use a ANSI C compiler. This means under SunOS 4 you can't 
-  # use cc, instead you will have to use gcc. 
-! # CC = gcc
-  
-  # This may help with some versions of make
-  SHELL = /bin/sh
---- 23,35 ----
-  # add -DSYSLOG for syslog support
-  # RPM_OPT_FLAGS is needed when building an RPM distribution package
-  # for RedHat Linux.
-! FLAGS1 = $(RPM_OPT_FLAGS)
-! # FLAGS1 = -O
-  LIBS1 = 
-  
-  # You will need to use a ANSI C compiler. This means under SunOS 4 you can't 
-  # use cc, instead you will have to use gcc. 
-! CC = gcc
-  
-  # This may help with some versions of make
-  SHELL = /bin/sh
-***************
-*** 48,54 ****
-  LMHOSTSFILE = $(LIBDIR)/lmhosts
-  
-  # the directory where lock files go
-! LOCKDIR = $(VARDIR)/locks
-  
-  # set this to the default group you want your machine to appear in
-  # for browsing. This can also be set in nmbd (see nmbd(8))
---- 48,54 ----
-  LMHOSTSFILE = $(LIBDIR)/lmhosts
-  
-  # the directory where lock files go
-! LOCKDIR = /var/lock/samba
-  
-  # set this to the default group you want your machine to appear in
-  # for browsing. This can also be set in nmbd (see nmbd(8))
-***************
-*** 71,78 ****
-  
-  # This is for PAM authentication. RedHat Linux uses PAM.
-  # If you use PAM, then uncomment the following lines:
-! # PAM_FLAGS = -DUSE_PAM
-! # PAM_LIBS = -ldl -lpam
-  
-  # This is for AFS authentication.  If you use AFS then set AFS_BASE 
-  # according to your system layout, and uncomment the other lines as well.
---- 71,78 ----
-  
-  # This is for PAM authentication. RedHat Linux uses PAM.
-  # If you use PAM, then uncomment the following lines:
-! PAM_FLAGS = -DUSE_PAM
-! PAM_LIBS = -ldl -lpam
-  
-  # This is for AFS authentication.  If you use AFS then set AFS_BASE 
-  # according to your system layout, and uncomment the other lines as well.
-***************
-*** 181,188 ****
-  # contributed by Andrew.Tridgell@anu.edu.au
-  # AXPROC defines DEC Alpha Processor
-  # FLAGSM = -DLINUX -DAXPROC
-! # FLAGSM = -DLINUX
-! # LIBSM = 
-  
-  # Use this for Linux with shadow passwords and quota
-  # contributed by xeno@mix.hive.no
---- 181,188 ----
-  # contributed by Andrew.Tridgell@anu.edu.au
-  # AXPROC defines DEC Alpha Processor
-  # FLAGSM = -DLINUX -DAXPROC
-! FLAGSM = -DLINUX
-! LIBSM = 
-  
-  # Use this for Linux with shadow passwords and quota
-  # contributed by xeno@mix.hive.no
+--- samba-1.9.17/source/Makefile.orig	Fri Jul  4 07:22:06 1997
++++ samba-1.9.17/source/Makefile	Fri Jul  4 07:27:17 1997
+@@ -5,16 +5,16 @@
+ 
+ # The base manpages directory to put the man pages in
+ # Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist.
+-MANDIR = /usr/local/man
++MANDIR = /usr/man
+ 
+ # The directories to put things in. If you use multiple
+ # architectures or share the samba binaries across NFS then
+ # you will probably want to change this layout.
+-BASEDIR = /usr/local/samba
+-BINDIR = /usr/local/bin
+-SBINDIR = $(BASEDIR)/bin
+-LIBDIR = $(BASEDIR)/lib
+-VARDIR = $(BASEDIR)/var
++BASEDIR = /usr
++BINDIR = $(BASEDIR)/bin
++SBINDIR = $(BASEDIR)/sbin
++LIBDIR = /etc
++VARDIR = /var
+ 
+ # The permissions to give the executables
+ INSTALLPERMS = 0755
+@@ -23,13 +23,13 @@
+ # add -DSYSLOG for syslog support
+ # RPM_OPT_FLAGS is needed when building an RPM distribution package
+ # for RedHat Linux.
+-# FLAGS1 = $(RPM_OPT_FLAGS)
+-FLAGS1 = -O
++FLAGS1 = $(RPM_OPT_FLAGS)
++# FLAGS1 = -O
+ LIBS1 = 
+ 
+ # You will need to use a ANSI C compiler. This means under SunOS 4 you can't 
+ # use cc, instead you will have to use gcc. 
+-# CC = gcc
++CC = gcc
+ 
+ # This may help with some versions of make
+ SHELL = /bin/sh
+@@ -42,13 +42,13 @@
+ # 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/log.smb
++NMBLOGFILE = $(VARDIR)/log/log.nmb
+ CONFIGFILE = $(LIBDIR)/smb.conf
+ LMHOSTSFILE = $(LIBDIR)/lmhosts
+ 
+ # the directory where lock files go
+-LOCKDIR = $(VARDIR)/locks
++LOCKDIR = $(VARDIR)/lock/samba
+ 
+ # set this to the default group you want your machine to appear in
+ # for browsing. This can also be set in nmbd (see nmbd(8))
+@@ -71,8 +71,8 @@
+ 
+ # This is for PAM authentication. RedHat Linux uses PAM.
+ # If you use PAM, then uncomment the following lines:
+-# PAM_FLAGS = -DUSE_PAM
+-# PAM_LIBS = -ldl -lpam
++PAM_FLAGS = -DUSE_PAM
++PAM_LIBS = -ldl -lpam
+ 
+ # This is for AFS authentication.  If you use AFS then set AFS_BASE 
+ # according to your system layout, and uncomment the other lines as well.
+@@ -181,8 +181,8 @@
+ # contributed by Andrew.Tridgell@anu.edu.au
+ # AXPROC defines DEC Alpha Processor
+ # FLAGSM = -DLINUX -DAXPROC -DFAST_SHARE_MODES
+-# FLAGSM = -DLINUX -DFAST_SHARE_MODES
+-# LIBSM = 
++FLAGSM = -DLINUX -DFAST_SHARE_MODES
++LIBSM = 
+ 
+ # Use this for Linux with shadow passwords and quota
+ # contributed by xeno@mix.hive.no
diff --git a/examples/redhat/samba.spec b/examples/redhat/samba.spec
index 5b058de5bc..ee427e0509 100644
--- a/examples/redhat/samba.spec
+++ b/examples/redhat/samba.spec
@@ -1,15 +1,16 @@
 Summary: SMB client and server
 Name: samba
-Version: 1.9.17
-Release: 1
+%define	version 1.9.17
+Version: %{version}
+Release: 2
 Copyright: GPL
 Group: Networking
-Source: ftp://samba.anu.edu.au/pub/samba/samba-1.9.17.tar.gz
+Source: ftp://samba.anu.edu.au/pub/samba/samba-%{version}.tar.gz
 Patch: samba-make.patch
 Patch2: samba-axp.patch
 Packager: John H Terpstra [Samba-Team] <jht@aquasoft.com.au>
 Requires: pamconfig
-BuildRoot: /tmp/samba-root
+BuildRoot: /tmp/samba
 
 %description
 Samba provides an SMB server which can be used to provide network