From 0943a7a494eae379e1a5166e925a78e30cac2c958dd51c63a77438c0cccf2a25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tomas.chvatal@gmail.com>
Date: Mon, 19 May 2014 11:56:09 +0000
Subject: [PATCH] Accepting request 233447 from
 home:coolo:branches:openSUSE:Factory

- use %_rundir for %ghost directory - leaving /var/run everywhere
  else

OBS-URL: https://build.opensuse.org/request/show/233447
OBS-URL: https://build.opensuse.org/package/show/network:vpn/openvpn?expand=0&rev=75
---
 openvpn.changes | 6 ++++++
 openvpn.spec    | 9 ++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/openvpn.changes b/openvpn.changes
index 08512b6..deda169 100644
--- a/openvpn.changes
+++ b/openvpn.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun May 11 07:58:52 UTC 2014 - coolo@suse.com
+
+- use %_rundir for %ghost directory - leaving /var/run everywhere
+  else
+
 -------------------------------------------------------------------
 Tue Jan 14 10:43:19 UTC 2014 - mt@suse.de
 
diff --git a/openvpn.spec b/openvpn.spec
index af5344c..1e985f6 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -21,6 +21,9 @@
 %else
 %define with_systemd 0
 %endif
+%if ! %{defined _rundir}
+%define _rundir %{_localstatedir}/run
+%endif
 
 Name:           openvpn
 Url:            http://openvpn.net/
@@ -153,7 +156,7 @@ make
 make DESTDIR=$RPM_BUILD_ROOT install
 find $RPM_BUILD_ROOT -name '*.la' | xargs rm -f
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/openvpn
-mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/run/openvpn
+mkdir -p $RPM_BUILD_ROOT/%{_rundir}/openvpn
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/openvpn
 %if %{with_systemd}
 install -D -m 644 $RPM_SOURCE_DIR/%{name}.service %{buildroot}/%{_unitdir}/%{name}@.service
@@ -178,7 +181,7 @@ install -m 755 $RPM_SOURCE_DIR/client-netconfig.down sample/sample-scripts/clien
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/{OpenVPN,%name}
 
 %post
-%__mkdir_p -m750 %{_localstatedir}/run/openvpn
+%__mkdir_p -m750 %{_rundir}/openvpn
 %if %{with_systemd}
 %service_add_post %{name}.target
 # try to migrate openvpn.service autostart to openvpn@<CONF>.service
@@ -255,7 +258,7 @@ rm -f /etc/sysconfig/openvpn || :
 %endif
 %{_sbindir}/rcopenvpn
 %{_sbindir}/openvpn
-%attr(0750,root,root) %dir %ghost %{_localstatedir}/run/openvpn
+%attr(0750,root,root) %dir %ghost %{_rundir}/openvpn
 %{_includedir}/%{name}-plugin.h
 
 %files down-root-plugin