SPECS: samba.spec - move "lockdir" from /var/lock/samba to /var/li...

[qboosh]

Author: qboosh                       Date: Tue Jan 10 14:42:27 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- move "lockdir" from /var/lock/samba to /var/lib/samba as it contains
  persistent valuable data and some cache, not just locks!
  (merged from OpenBIZ)
- removed outdated STATUS..LCK and mkdirs trigger

---- Files affected:
SPECS:
   samba.spec (1.311 -> 1.312) 

---- Diffs:

================================================================
Index: SPECS/samba.spec
diff -u SPECS/samba.spec:1.311 SPECS/samba.spec:1.312
--- SPECS/samba.spec:1.311	Fri Jan  6 15:10:47 2006
+++ SPECS/samba.spec	Tue Jan 10 15:42:21 2006
@@ -986,6 +986,7 @@
 	--with-acl-support \
 	--with-automount \
 	--with-libsmbclient \
+	--with-lockdir=/var/lib/samba \
 	--with-pam \
 	--with-pam_smbpass \
 	--with%{!?with_ads:out}-ads \
@@ -1022,7 +1023,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,pam.d,security,sysconfig/rc-inetd} \
-	$RPM_BUILD_ROOT/var/{lock,log,log/archiv,spool}/samba \
+	$RPM_BUILD_ROOT{/var/{log,log/archiv,spool}/samba,/var/lib/samba/printing} \
 	$RPM_BUILD_ROOT{/sbin,/%{_lib}/security,%{_libdir},%{_vfsdir},%{_includedir},%{_sambahome},%{schemadir}}
 
 cd source
@@ -1065,7 +1066,7 @@
 install examples/VFS/samba-vscan-%{vscan_version}/*.so $RPM_BUILD_ROOT%{_vfsdir}
 install examples/VFS/samba-vscan-%{vscan_version}/{antivir,clamav,fprot,icap,kaspersky,mks,openantivirus,sophos,trend,f-secure,nai}/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba
 
-touch $RPM_BUILD_ROOT/var/lock/samba/{STATUS..LCK,wins.dat,browse.dat}
+touch $RPM_BUILD_ROOT/var/lib/samba/{wins.dat,browse.dat}
 
 echo 127.0.0.1 localhost > $RPM_BUILD_ROOT%{_sysconfdir}/samba/lmhosts
 
@@ -1098,7 +1099,18 @@
 %post
 /sbin/chkconfig --add smb
 if [ -r /var/lock/subsys/smb ]; then
-	/etc/rc.d/init.d/smb restart >&2
+	if [ -f /var/lock/samba/connections.tdb -a ! -f /var/lib/samba/connections.tdb ]; then
+		echo "Moving old /var/lock/samba contents to /var/lib/samba"
+		/etc/rc.d/init.d/smb stop >&2
+		mv -f /var/lock/samba/*.tdb /var/lib/samba 2>/dev/null || :
+		mv -f /var/lock/samba/*.dat /var/lib/samba 2>/dev/null || :
+		if [ -d /var/lock/samba/printing ]; then
+			mv -f /var/lock/samba/printing/*.tdb /var/lib/samba/printing 2>/dev/null || :
+		fi
+		/etc/rc.d/init.d/smb start >&2
+	else
+		/etc/rc.d/init.d/smb restart >&2
+	fi
 else
 	echo "Run \"/etc/rc.d/init.d/smb start\" to start Samba daemons."
 fi
@@ -1179,12 +1191,6 @@
 	/sbin/chkconfig --add smb
 fi
 
-%triggerpostun -- samba < 2.0.5a-3
-if [ "$1" != "0" ]; then
-	[ ! -d /var/lock/samba ] && mkdir -m 0755 /var/lock/samba
-	[ ! -d /var/spool/samba ] && mkdir -m 1777 /var/spool/samba
-fi
-
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/nmbd
@@ -1216,8 +1222,9 @@
 %{_mandir}/man8/tdbbackup.8*
 
 %dir %{_sambahome}
-%dir /var/lock/samba
-%ghost /var/lock/samba/*
+%dir /var/lib/samba
+%ghost /var/lib/samba/*.dat
+%dir /var/lib/samba/printing
 
 %attr(750,root,root) %dir /var/log/samba
 %attr(750,root,root) %dir /var/log/archiv/samba
@@ -1509,6 +1516,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.312  2006/01/10 14:42:21  qboosh
+- move "lockdir" from /var/lock/samba to /var/lib/samba as it contains
+  persistent valuable data and some cache, not just locks!
+  (merged from OpenBIZ)
+- removed outdated STATUS..LCK and mkdirs trigger
+
 Revision 1.311  2006/01/06 14:10:47  zawadaa
 - up to 3.0.21a
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/samba.spec?r1=1.311&r2=1.312&f=u