From af76b2230be6b1d61936850b9a6fc68f4fc4f8fc858d4795a1954482d60527b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Fri, 25 Sep 2015 19:28:45 +0000
Subject: [PATCH] Express post-12.2 simpler; no else case

This is identical to the apparoch used before the tmpfilesdir relocation

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

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 11506c9..0494462 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e2572198a7ded7724edada0cef6e90b0910756baca9b6da5039e7c0dc61f04e8
-size 29251
+oid sha256:2cff97e99f20b3593429086946ced5becf5b402b226ac568c8b53c36aadaca33
+size 29242
diff --git a/samba.spec b/samba.spec
index 51b101f..75c7a99 100644
--- a/samba.spec
+++ b/samba.spec
@@ -144,7 +144,7 @@ BuildRequires:  systemd-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3494
+%define SOURCE_TIMESTAMP 3495
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
@@ -1769,9 +1769,6 @@ fi
 %endif
 %attr(0644,root,root) %{_datadir}/omc/svcinfo.d/%{cifs_init_script}.xml
 %ghost %{_localstatedir}/run/%{cifs_init_script}
-%else
-%dir %{_tmpfilesdir}
-%{_tmpfilesdir}/samba.conf
 %endif
 %dir %{CONFIGDIR}
 %config(noreplace) %{CONFIGDIR}/lmhosts
@@ -1864,6 +1861,8 @@ fi
 %attr(0750,root,root) %dir %{LOGDIR}
 %ghost %dir %{PIDDIR}
 %if 0%{?suse_version} > 1220
+%dir %{_tmpfilesdir}
+%{_tmpfilesdir}/samba.conf
 %{_var}/adm/fillup-templates/sysconfig.samba-client
 %endif
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index c6dbbdf..b909bb2 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:70ce2b9520f5ee63e1a39e4f6653f2641294876730d2792ca2b1574489ba36dc
-size 52827
+oid sha256:31e784e5fc67a4940ff1ed2d05a7d566e51dabccbda50a95223b8b9374e3b716
+size 52838