Preparing for 2.0.1 - updated rpm packaging now we can do

--with-lockdir and --with-privatedir.
JEremy.

7 files changed, 10 insertions, 76 deletions

diff --git a/packaging/Caldera/makefile-path.patch b/packaging/Caldera/makefile-path.patch
index 37cf817d0de..88d5222e09a 100644
--- a/packaging/Caldera/makefile-path.patch
+++ b/packaging/Caldera/makefile-path.patch
@@ -1,5 +1,5 @@
---- 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
+--- samba-2.0.1/source/Makefile.in.orig	Tue Dec  1 22:32:20 1998
++++ samba-2.0.1/source/Makefile.in	Wed Dec  2 17:11:33 1998
 @@ -25,9 +25,9 @@
  BINDIR = @bindir@
  # we don't use sbindir because we want full compatibility with
@@ -10,25 +10,3 @@
 -VARDIR = @localstatedir@
 +VARDIR = /var/log/samba
  MANDIR = @mandir@
- 
- # The permissions to give the executables
-@@ -43,16 +43,16 @@
- DRIVERFILE = $(LIBDIR)/printers.def
- PASSWD_PROGRAM = /bin/passwd
- # 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 = @swatdir@
-+SWATDIR = /usr/share/swat
- 
- # the directory where lock files go
--LOCKDIR = $(VARDIR)/locks
-+LOCKDIR = /var/lock/samba
- 
- # The directory where code page definition files go
- CODEPAGEDIR = $(LIBDIR)/codepages
diff --git a/packaging/Caldera/samba2.spec.tmpl b/packaging/Caldera/samba2.spec.tmpl
index 84fe3dcd3b0..c8e53e08524 100644
--- a/packaging/Caldera/samba2.spec.tmpl
+++ b/packaging/Caldera/samba2.spec.tmpl
@@ -42,7 +42,7 @@ docs directory for implementation details.
 
 %build
 cd source
-./configure --prefix=/usr --libdir=/etc
+./configure --prefix=/usr --libdir=/etc --with-lockdir=/var/lock/samba --with-privatedir=/etc --with-swatdir=/usr/share/swat
 make all
 
 %install
diff --git a/packaging/PHT/TurboLinux/makefile-path.patch b/packaging/PHT/TurboLinux/makefile-path.patch
index 37cf817d0de..88d5222e09a 100644
--- a/packaging/PHT/TurboLinux/makefile-path.patch
+++ b/packaging/PHT/TurboLinux/makefile-path.patch
@@ -1,5 +1,5 @@
---- 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
+--- samba-2.0.1/source/Makefile.in.orig	Tue Dec  1 22:32:20 1998
++++ samba-2.0.1/source/Makefile.in	Wed Dec  2 17:11:33 1998
 @@ -25,9 +25,9 @@
  BINDIR = @bindir@
  # we don't use sbindir because we want full compatibility with
@@ -10,25 +10,3 @@
 -VARDIR = @localstatedir@
 +VARDIR = /var/log/samba
  MANDIR = @mandir@
- 
- # The permissions to give the executables
-@@ -43,16 +43,16 @@
- DRIVERFILE = $(LIBDIR)/printers.def
- PASSWD_PROGRAM = /bin/passwd
- # 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 = @swatdir@
-+SWATDIR = /usr/share/swat
- 
- # the directory where lock files go
--LOCKDIR = $(VARDIR)/locks
-+LOCKDIR = /var/lock/samba
- 
- # The directory where code page definition files go
- CODEPAGEDIR = $(LIBDIR)/codepages
diff --git a/packaging/PHT/TurboLinux/samba2.spec.tmpl b/packaging/PHT/TurboLinux/samba2.spec.tmpl
index 1c9a3e4158d..06db95a69d5 100644
--- a/packaging/PHT/TurboLinux/samba2.spec.tmpl
+++ b/packaging/PHT/TurboLinux/samba2.spec.tmpl
@@ -96,7 +96,7 @@ enabled. PHT TurboLinux has built in support for quotas in PAM.
 
 %build
 cd source
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=/etc --with-smbwrapper --with-automount --with-quotas
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=/etc --with-lockdir=/var/lock/samba --with-privatedir=/etc --with-swatdir=/usr/share/swat --with-smbwrapper --with-automount --with-quotas
 make all smbwrapper
 
 %install
diff --git a/packaging/RedHat/makefile-path.patch b/packaging/RedHat/makefile-path.patch
index 37cf817d0de..88d5222e09a 100644
--- a/packaging/RedHat/makefile-path.patch
+++ b/packaging/RedHat/makefile-path.patch
@@ -1,5 +1,5 @@
---- 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
+--- samba-2.0.1/source/Makefile.in.orig	Tue Dec  1 22:32:20 1998
++++ samba-2.0.1/source/Makefile.in	Wed Dec  2 17:11:33 1998
 @@ -25,9 +25,9 @@
  BINDIR = @bindir@
  # we don't use sbindir because we want full compatibility with
@@ -10,25 +10,3 @@
 -VARDIR = @localstatedir@
 +VARDIR = /var/log/samba
  MANDIR = @mandir@
- 
- # The permissions to give the executables
-@@ -43,16 +43,16 @@
- DRIVERFILE = $(LIBDIR)/printers.def
- PASSWD_PROGRAM = /bin/passwd
- # 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 = @swatdir@
-+SWATDIR = /usr/share/swat
- 
- # the directory where lock files go
--LOCKDIR = $(VARDIR)/locks
-+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 d4e0133ccfd..211e04973a3 100644
--- a/packaging/RedHat/samba2.spec.tmpl
+++ b/packaging/RedHat/samba2.spec.tmpl
@@ -97,7 +97,7 @@ enabled. Red Hat Linux has built in support for quotas in PAM.
 
 %build
 cd source
-./configure --prefix=/usr --libdir=/etc --with-smbwrapper --with-automount --with-quotas
+./configure --prefix=/usr --libdir=/etc --with-lockdir=/var/lock/samba --with-privatedir=/etc --with-swatdir=/usr/share/swat --with-smbwrapper --with-automount --with-quotas
 make all smbwrapper
 
 %install
diff --git a/source/include/version.h b/source/include/version.h
index 082fe6a5e99..7f364e8321c 100644
--- a/source/include/version.h
+++ b/source/include/version.h
@@ -1 +1 @@
-#define VERSION "2.0.0"
+#define VERSION "2.0.1"