From 440ac9bf908a278c8f5970e35dc11af52ff072fc6896d5c580b9494377da2fa7 Mon Sep 17 00:00:00 2001
From: Lars Vogdt <lrupp@suse.com>
Date: Sun, 6 Nov 2011 08:29:02 +0000
Subject: [PATCH] - added %livestatus_socketdir

OBS-URL: https://build.opensuse.org/package/show/server:monitoring/nagios-rpm-macros?expand=0&rev=15
---
 macros.check_mk | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/macros.check_mk b/macros.check_mk
index aee2541..e7a5d76 100644
--- a/macros.check_mk
+++ b/macros.check_mk
@@ -3,26 +3,28 @@
 #
 # place for livestatus.o libdir
 %livestatus_libdir				%{_prefix}/lib/check_mk
-# livesock
-%livestatus_socket_file			%{nagios_spooldir}/livestatus.cmd
-# livebackendsdir
-%livestatus_livebackendsdir		%{_datadir}/check_mk/livestatius
-# confdir
-%livestatus_sysconfdir 			%{_sysconfdir}/check_mk
-# check_mk_configdir
-%livestatus_check_mk_configdir	%{livestatus_sysconfdir}/conf.d
+#
+%livestatus_socketdir           %{_var}/spool/check_mk
 # 
 %livestatus_datadir				%{_datadir}/check_mk
-# agentsdir
-%livestatus_agentsdir			%{_datadir}/check_mk/agents
-# checksdir
-%livestatus_checksdir			%{_datadir}/check_mk/checks
-# modulesdir
-%livestatus_modulesdir			%{_datadir}/check_mk/modules
-# web_dir
-%livestatus_webdir				%{_datadir}/check_mk/web
+# confdir
+%livestatus_sysconfdir 			%{_sysconfdir}/check_mk
 # vardir
 %livestatus_vardir				%{_var}/lib/check_mk
+# livesock
+%livestatus_socket_file			%{livestatus_socketdir}/livestatus.cmd
+# livebackendsdir
+%livestatus_livebackendsdir		%{livestatus_datadir}/livestatius
+# check_mk_configdir
+%livestatus_check_mk_configdir	%{livestatus_sysconfdir}/conf.d
+# agentsdir
+%livestatus_agentsdir			%{livestatus_datadir}/agents
+# checksdir
+%livestatus_checksdir			%{livestatus_datadir}/checks
+# modulesdir
+%livestatus_modulesdir			%{livestatus_datadir}/modules
+# web_dir
+%livestatus_webdir				%{livestatus_datadir}/web
 # agentslibdir
 %livestatus_agentslibdir		%{_prefix}/lib/check_mk_agent
 # agentsconfdir
@@ -32,4 +34,4 @@
 # nagconfdir
 %livestatus_nagconfdir			%{nagios_sysconfdir}/check_mk.d
 # rrddir
-%livestatus_rrddir				%{_var}/lib/check_mk/rrd
+%livestatus_rrddir				%{livestatus_libdir}/rrd