From 91761c314579f1d1a1516127361b5da015b07e0537627971c8af7a97fe81b2f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Wed, 2 Mar 2016 15:19:44 +0000
Subject: [PATCH] Relocate lock directory to the client package

Else the directory is missing at install time and the relocating mv
command stacked one dir into the next with the same name. The last
remaining lock file then later got replaced by the dir created by the
samba (main) package.

Adding a ending / to the destination also of lock and private ensures
this will not bit us again.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=529
---
 patches.tar.bz2      | 4 ++--
 samba.spec           | 8 ++++----
 vendor-files.tar.bz2 | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 250d7be..f2e3a0b 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7faac92050b79673cf8dc00b1f58c0514be1e032e76920bb35c44b5733574109
-size 12707
+oid sha256:6dd076b965812674d50e32648319ffbcc14a2ce2b876224fe913eacb7c621ca2
+size 12702
diff --git a/samba.spec b/samba.spec
index e3a347a..b46d9b4 100644
--- a/samba.spec
+++ b/samba.spec
@@ -142,7 +142,7 @@ BuildRequires:  libpcp-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 0
+%define SOURCE_TIMESTAMP 3609
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
@@ -1566,11 +1566,11 @@ else
 fi
 for fn in netlogon_creds_cli.tdb passdb.tdb secrets.tdb smbpasswd; do
 	test ! -e %{LOCKDIR}/private/$fn && test -e %{CONFIGDIR}/$fn && \
-		mv %{CONFIGDIR}/$fn %{LOCKDIR}/private
+		mv %{CONFIGDIR}/$fn %{LOCKDIR}/private/
 done
 for fn in brlock.tdb dbwrap_watchers.tdb gencache_notrans.tdb leases.tdb locking.tdb mutex.tdb names.tdb printer_list.tdb serverid.tdb smbXsrv_client_global.tdb smbXsrv_open_global.tdb smbXsrv_session_global.tdb smbXsrv_tcon_global.tdb smbXsrv_version_global.tdb srv_fss.tdb; do
 	test ! -e %{LOCKDIR}/lock/$fn && test -e %{LOCKDIR}/$fn && \
-		mv %{LOCKDIR}/$fn %{LOCKDIR}/lock
+		mv %{LOCKDIR}/$fn %{LOCKDIR}/lock/
 done
 %if 0%{?suse_version} && 0%{?suse_version} < 1221
 if [ ${1:-0} -gt 1 -a -f /var/adm/backup/etc_samba_smbfstab-move ]; then
@@ -1773,7 +1773,6 @@ fi
 %{_libdir}/samba/config
 %{_libdir}/samba/rpc
 %attr(0775,root,ntadmin) %{LOCKDIR}/drivers
-%dir %{LOCKDIR}/lock
 %dir %{LOCKDIR}/lock/msg.lock
 %{LOCKDIR}/netlogon
 %attr(0770,root,users) %dir %{LOCKDIR}/profiles
@@ -1953,6 +1952,7 @@ fi
 %{_localstatedir}/adm/fillup-templates/samba-client-dhcp.conf
 %{_localstatedir}/adm/fillup-templates/sysconfig.dhcp-samba-client
 %dir %{LOCKDIR}
+%dir %{LOCKDIR}/lock
 %dir %{LOCKDIR}/private
 %attr(0700,root,root) %dir %{LOCKDIR}/private/msg.sock
 %attr(0750,root,root) %dir %{LOGDIR}
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index c358f76..5076734 100644
--- a/vendor-files.tar.bz2
+++ b/vendor-files.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:00a65248884f3df5c551e5eca9e1ee237d44857b6931e038830932b741ad3259
-size 55714
+oid sha256:3aa0febdd885f37e1b8b757160e883ca17a79a165210c4f89db13dc41a91d8bc
+size 55686