We need to change /var/lock/samba to /var/cache/samba in the spec files

and explain the change in the WHATSNEW.txt.
Jeremy.

3 files changed, 24 insertions, 23 deletions

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index e782fb8d85e..d4976cbce1b 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -86,6 +86,8 @@ Changes in 2.2.1
 29). Swat fixes for being run with xinetd that doesn't set the umask.
 30). Fix for slow writes with Win9x Explorer clients. Emulates Microsoft
      TCP stack early ack specification error.
+31). Changed lock & persistant tdb directory to /var/cache/samba by default on
+     RedHat and Mandrake as they clear the /var/lock/samba directory on reboot.
 
 Older release notes for Samba 2.2.x follow.
 
diff --git a/packaging/Mandrake/samba2.spec.tmpl b/packaging/Mandrake/samba2.spec.tmpl
index 5bc92535f80..92fc57026f0 100644
--- a/packaging/Mandrake/samba2.spec.tmpl
+++ b/packaging/Mandrake/samba2.spec.tmpl
@@ -74,7 +74,6 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA" ./configure \
 	--localstatedir=/var \
 	--with-codepagedir=%{prefix}/share/samba/codepages \
 	--with-configdir=/etc/samba \
-	--with-lockdir=/var/lock/samba \
 	--with-swatdir=%{prefix}/share/swat \
 	--with-quotas \
 	--with-smbmount \
@@ -102,7 +101,7 @@ mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/{images,help,include}
 mkdir -p $RPM_BUILD_ROOT%{prefix}/share/samba/codepages/src 
 mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/using_samba/{figs,gifs}
 mkdir -p $RPM_BUILD_ROOT%{prefix}/share/man/{man1,man5,man7,man8}
-mkdir -p $RPM_BUILD_ROOT/var/lock/samba
+mkdir -p $RPM_BUILD_ROOT/var/cache/samba
 mkdir -p $RPM_BUILD_ROOT/var/log/samba
 mkdir -p $RPM_BUILD_ROOT/var/spool/samba
 
@@ -235,8 +234,8 @@ if [ $1 = 0 ] ; then
     /sbin/chkconfig --del smb
 
     # We want to remove the browse.dat file
-    if [ -e /var/lock/samba/browse.dat ]; then
-	    rm -f /var/lock/samba/browse.dat
+    if [ -e /var/cache/samba/browse.dat ]; then
+	    rm -f /var/cache/samba/browse.dat
     fi
 fi
 
@@ -249,8 +248,8 @@ if [ $1 = 0 ] ; then
     if [ -e /var/log/samba ]; then
       rm -rf /var/log/samba
     fi
-    if [ -e /var/lock/samba ]; then
-      rm -rf /var/lock/samba
+    if [ -e /var/cache/samba ]; then
+      rm -rf /var/cache/samba
     fi
 
     # Remove swat entries from /etc/inetd.conf and /etc/services
@@ -292,7 +291,7 @@ fi
 %attr(-,root,root) %dir /etc/samba/
 %attr(-,root,root) %dir /usr/share/samba/codepages/*
 %attr(-,root,root) %dir /usr/share/samba/codepages/src/*
-%attr(-,root,root) %dir /var/lock/samba
+%attr(-,root,root) %dir /var/cache/samba
 %attr(-,root,root) %dir /var/log/samba
 %attr(1777,root,root) %dir /var/spool/samba
 
diff --git a/packaging/RedHat/samba2.spec.tmpl b/packaging/RedHat/samba2.spec.tmpl
index 44a8fe998e3..d8fff274f8a 100644
--- a/packaging/RedHat/samba2.spec.tmpl
+++ b/packaging/RedHat/samba2.spec.tmpl
@@ -180,7 +180,7 @@ mkdir -p $RPM_BUILD_ROOT%{prefix}/{bin,sbin}
 mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/{images,help,include,using_samba}
 mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/using_samba/{figs,gifs}
 mkdir -p $RPM_BUILD_ROOTMANDIR_MACRO
-mkdir -p $RPM_BUILD_ROOT/var/lock/samba
+mkdir -p $RPM_BUILD_ROOT/var/cache/samba
 mkdir -p $RPM_BUILD_ROOT/var/log/samba
 mkdir -p $RPM_BUILD_ROOT/var/spool/samba
 mkdir -p $RPM_BUILD_ROOT/lib
@@ -329,32 +329,32 @@ if [ $1 = 0 ] ; then
     /sbin/chkconfig --del smb
 
     # We want to remove the browse.dat and wins.dat files so they can not interfer with a new version of samba!
-    if [ -e /var/lock/samba/browse.dat ]; then
-	    rm -f /var/lock/samba/browse.dat
+    if [ -e /var/cache/samba/browse.dat ]; then
+	    rm -f /var/cache/samba/browse.dat
     fi
-    if [ -e /var/lock/samba/wins.dat ]; then
-	    rm -f /var/lock/samba/wins.dat
+    if [ -e /var/cache/samba/wins.dat ]; then
+	    rm -f /var/cache/samba/wins.dat
     fi
 
 	# Remove the transient tdb files.
-	if [ -e /var/lock/samba/brlock.tdb ]; then
-		rm -f /var/lock/samba/brlock.tdb
+	if [ -e /var/cache/samba/brlock.tdb ]; then
+		rm -f /var/cache/samba/brlock.tdb
 	fi
 
-	if [ -e /var/lock/samba/unexpected.tdb ]; then
-		rm -f /var/lock/samba/unexpected.tdb
+	if [ -e /var/cache/samba/unexpected.tdb ]; then
+		rm -f /var/cache/samba/unexpected.tdb
 	fi
 
-	if [ -e /var/lock/samba/connections.tdb ]; then
-		rm -f /var/lock/samba/connections.tdb
+	if [ -e /var/cache/samba/connections.tdb ]; then
+		rm -f /var/cache/samba/connections.tdb
 	fi
 
-	if [ -e /var/lock/samba/locking.tdb ]; then
-		rm -f /var/lock/samba/locking.tdb
+	if [ -e /var/cache/samba/locking.tdb ]; then
+		rm -f /var/cache/samba/locking.tdb
 	fi
 
-	if [ -e /var/lock/samba/messages.tdb ]; then
-		rm -f /var/lock/samba/messages.tdb
+	if [ -e /var/cache/samba/messages.tdb ]; then
+		rm -f /var/cache/samba/messages.tdb
 	fi
 
 fi
@@ -444,6 +444,6 @@ fi
 %attr(-,root,root) MANDIR_MACRO/man7/*
 %attr(-,root,root) MANDIR_MACRO/man8/*
 %attr(-,root,root) %dir /etc/codepages/*
-%attr(755,root,root) %dir /var/lock/samba
+%attr(755,root,root) %dir /var/cache/samba
 %attr(-,root,root) %dir /var/log/samba
 %attr(1777,root,root) %dir /var/spool/samba