git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0c78ad4)
Preparing for 2.0.1 - updated rpm packaging now we can do
authorJeremy Allison <jra@samba.org>
Sat, 6 Feb 1999 00:56:26 +0000 (00:56 +0000)
committerJeremy Allison <jra@samba.org>
Sat, 6 Feb 1999 00:56:26 +0000 (00:56 +0000)
--with-lockdir and --with-privatedir.
JEremy.

packaging/Caldera/makefile-path.patch patch | blob | history
packaging/Caldera/samba2.spec.tmpl patch | blob | history
packaging/PHT/TurboLinux/makefile-path.patch patch | blob | history
packaging/PHT/TurboLinux/samba2.spec.tmpl patch | blob | history
packaging/RedHat/makefile-path.patch patch | blob | history
packaging/RedHat/samba2.spec.tmpl patch | blob | history
source/include/version.h patch | blob | history

diff --git a/packaging/Caldera/makefile-path.patch b/packaging/Caldera/makefile-path.patch
index 37cf817d0dec854c82e4da88cb76c26eb8b279df..88d5222e09ad30f4ef8eb372f2146e61a764bff2 100644 (file)
--- 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 84fe3dcd3b063289b4500af0aa406b5ca4a668da..c8e53e08524af9f12d06c5ce683b867cd7214c10 100644 (file)
--- 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 37cf817d0dec854c82e4da88cb76c26eb8b279df..88d5222e09ad30f4ef8eb372f2146e61a764bff2 100644 (file)
--- 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 1c9a3e4158d9664c212b5ddd64b8c2fa7c3f23e8..06db95a69d53ce7005eac44aafff21cd2194a14c 100644 (file)
--- 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 37cf817d0dec854c82e4da88cb76c26eb8b279df..88d5222e09ad30f4ef8eb372f2146e61a764bff2 100644 (file)
--- 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 d4e0133ccfd56d2fa88d16eb088f6e3348a4d6b6..211e04973a3b86366be778bde447b266db29143e 100644 (file)
--- 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 082fe6a5e992e32b1ac341fbe91da5956fe1961e..7f364e8321cd730448bdfd089da76d496e162792 100644 (file)
--- a/source/include/version.h
+++ b/source/include/version.h
@@ -1 +1 @@
-#define VERSION "2.0.0"
+#define VERSION "2.0.1"
Samba Shared Repository