From 76f4370b96bd78b2fc68754aa5a6ffa7cbe083d4a9c90fe95d3d4bb716fc6517 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Wed, 2 Mar 2016 12:11:47 +0000
Subject: [PATCH] - Revert to state withou conflicts

OBS-URL: https://build.opensuse.org/package/show/server:proxy/cntlm?expand=0&rev=29
---
 cntlm.changes |  5 +++++
 cntlm.spec    | 17 +++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/cntlm.changes b/cntlm.changes
index f76bfdd..b94e104 100644
--- a/cntlm.changes
+++ b/cntlm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Mar  2 12:11:26 UTC 2016 - mpluskal@suse.com
+
+- Revert to state withou conflicts
+
 -------------------------------------------------------------------
 Sun Apr 26 11:22:30 UTC 2015 - mpluskal@suse.com
 
diff --git a/cntlm.spec b/cntlm.spec
index c687113..ddc7de0 100644
--- a/cntlm.spec
+++ b/cntlm.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cntlm
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2007 Scorpio IT, Deidesheim, Germany
 #
 # All modifications and additions to the file contributed by third parties
@@ -66,14 +66,12 @@ make %{?_smp_mflags}
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
 
 %if 0%{?suse_version} < 1230
-install -d %{buildroot}%{_localstatedir}/run/%{name}
 install -D -m 755 %{SOURCE1} %{buildroot}/%{_initddir}/%{name}
 ln -s -f ../..%{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name}
 %else
-# With systemd, use new standard pid directory /run
-install -d %{buildroot}/run/%{name}
+install -d %{buildroot}%{_localstatedir}/run/%{name}
 install -D -m 644 %{SOURCE3} %{buildroot}/%{_unitdir}/%{name}.service
-install -D -m 644 %{SOURCE4} %{buildroot}%{_libexecdir}/tmpfiles.d/%{name}.conf
+install -D -m 644 %{SOURCE4} %{buildroot}/%{_tmpfilesdir}/%{name}.conf
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 %endif
 install -D -m 644 %{SOURCE2} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
@@ -109,6 +107,11 @@ fi
 %else
 %fillup_only
 %service_add_post %{name}.service
+%if 0%{?suse_version} <= 1320
+systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf >/dev/null 2>&1 || :
+%else
+%tmpfiles_create %{_tmpfilesdir}/%{name}.conf
+%endif
 %endif
 
 %postun
@@ -126,11 +129,9 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %if 0%{?suse_version} < 1230
 %config(noreplace) %{_initddir}/%{name}
-%ghost %dir %attr(755,%{name},root) %{_localstatedir}/run/%{name}
 %else
 %{_unitdir}/%{name}.service
-%dir %{_libexecdir}/tmpfiles.d
-%{_libexecdir}/tmpfiles.d/%{name}.conf
+%{_tmpfilesdir}/%{name}.conf
 %ghost %dir %attr(755,%{name},root) /run/%{name}
 %endif
 %{_sbindir}/*