averi pushed to check-mk (el6). "PLUGINSDIR move should happen after the setup.sh run"

[notifications at fedoraproject.org]

>From a59be9abdd5fc1df485e73f840e74c30ea85e9f2 Mon Sep 17 00:00:00 2001
From: Andrea Veri <av at gnome.org>
Date: Mon, 13 Apr 2015 12:33:18 +0200
Subject: PLUGINSDIR move should happen after the setup.sh run


diff --git a/check-mk.spec b/check-mk.spec
index 0ad5566..9675f2a 100644
--- a/check-mk.spec
+++ b/check-mk.spec
@@ -134,7 +134,6 @@ install -m 755 waitmax %{buildroot}%{_bindir}/waitmax
 install -d -m 755 %{buildroot}%{_datadir}/check-mk-agent
 install -d -m 755 %{buildroot}%{_datadir}/check-mk-agent/plugins
 install -d -m 755 %{buildroot}%{_datadir}/check-mk-agent/local
-mv %{buildroot}%{_datadir}/check_mk/plugins/* %{buildroot}%{_datadir}/check-mk-agent/plugins/
 
 # Create an /etc/check-mk-agent directory for agent's configuration files. Examples
 # will be then available under the /usr/share/check_mk/agents/cfg_examples directory.
@@ -197,6 +196,11 @@ mkdir -p %{buildroot}%{_sysconfdir}/nagios/conf.d/
 cp -r %{buildroot}%{_datadir}/check_mk/check_mk_templates.cfg %{buildroot}%{_sysconfdir}/nagios/conf.d/check_mk_templates.cfg
 rm %{buildroot}%{_sysconfdir}/nagios/objects/check_mk_templates.cfg
 
+# PLUGINSDIR on the check_mk_agent binary file is set to be %%{_datadir}/check-mk-agent/plugins,
+# make sure files are copied over to the correct location.
+cp -r %{buildroot}%{_datadir}/check_mk/plugins/* %{buildroot}%{_datadir}/check-mk-agent/plugins/
+rm -rf %{buildroot}%{_datadir}/check_mk/plugins/
+
 # Fix the path for the Nagios plugins
 sed -i 's|/usr/lib/nagios/plugins|%{_libdir}/nagios/plugins|' \
   %{buildroot}%{_sysconfdir}/nagios/conf.d/check_mk_templates.cfg
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/check-mk.git/commit/?h=el6&id=a59be9abdd5fc1df485e73f840e74c30ea85e9f2