From 3e4c02b2ab892348f8042ccbacb4d44712b4d9771e7a1264b29fc7e57db49c31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Mon, 6 Jan 2014 14:26:34 +0000
Subject: [PATCH] Create /var/run/samba with systemd-tmpfiles on post-12.2
 systems; (bnc#856759).

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

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 36e20e5..f43fe3e 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d5d3c49b5661192f98eb5f1a3f204db692b8db8d02f56a55657d9f97ecb9e33f
-size 71251
+oid sha256:53d61b21f0629595db21720d714e1943561d5a63238a7227181a05f5c1082327
+size 71356
diff --git a/samba.changes b/samba.changes
index 22c9b3f..7b5f1d5 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,8 +1,14 @@
+-------------------------------------------------------------------
+Mon Jan  6 13:09:35 UTC 2014 - lmuelle@suse.com
+
+- Create /var/run/samba with systemd-tmpfiles on post-12.2 systems;
+  (bnc#856759).
+
 -------------------------------------------------------------------
 Mon Jan  6 10:06:59 UTC 2014 - lmuelle@suse.com
 
 - Fix broken rc{nmb,smb,winbind} sym links which should point to the service
-  binary on post-12.2 systems.
+  binary on post-12.2 systems; (bnc#856759).
 
 -------------------------------------------------------------------
 Mon Jan  6 07:01:48 UTC 2014 - ddiss@suse.com
diff --git a/samba.spec b/samba.spec
index 0545e5f..6b2e3fd 100644
--- a/samba.spec
+++ b/samba.spec
@@ -135,7 +135,7 @@ BuildRequires:  systemd
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3134
+%define SOURCE_TIMESTAMP 3136
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
@@ -1357,6 +1357,8 @@ for srv_name in nmb smb winbind; do
 		>%{buildroot}/%{_unitdir}/${srv_name}.service
 	ln -s ../../%{_sbindir}/service %{buildroot}/%{_sbindir}/rc${srv_name}
 done
+install -d -m 0755 %{buildroot}%{_prefix}/lib/tmpfiles.d
+install -m 0644 -p ../packaging/systemd/samba.conf.tmp %{buildroot}%{_prefix}/lib/tmpfiles.d/samba.conf
 %else
 for script in ${startScripts}; do
 	install -m 0755 "init/${script}${scriptSuffix}" \
@@ -1510,6 +1512,7 @@ getent group ntadmin >/dev/null || groupadd -g 71 -o -r ntadmin || :
 %post
 %if 0%{?suse_version} > 1220
 %service_add_post nmb.service smb.service
+%{_bindir}/systemd-tmpfiles --create %{_prefix}/lib/tmpfiles.d/samba.conf
 %endif
 
 %postun
@@ -1689,6 +1692,7 @@ else
 fi
 %if 0%{?suse_version} > 1220
 %service_add_post winbind.service
+%{_bindir}/systemd-tmpfiles --create %{_prefix}/lib/tmpfiles.d/samba.conf
 %endif
 
 %preun winbind
@@ -1772,6 +1776,10 @@ fi
 %attr(0644,root,root) %{_datadir}/omc/svcinfo.d/smb.xml
 %dir %{_datadir}/samba
 %{_datadir}/samba/update-apparmor-samba-profile
+%if 0%{?suse_version} > 1222
+%dir %{_prefix}/lib/tmpfiles.d
+%{_prefix}/lib/tmpfiles.d/samba.conf
+%endif
 %doc %{_mandir}/man1/smbstatus.1.*
 %doc %{_mandir}/man5/smbpasswd.5.*
 %doc %{_mandir}/man8/nmbd.8.*
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index f4d4e95..15d742d 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:4ebfee767cbc6932582f78ad52c0e11576a9c7d3e73e85d0cca6ba2992626c88
-size 54224
+oid sha256:261b3e0d258e6b201212ffae6eed9f51ba59f63afc6b3659f50d15f50e35c568
+size 54151