averi pushed to check-mk (f20). "Cherry-pick changes from 76ebedf and cb7dbf0"

[notifications at fedoraproject.org]

>From d1ec3182e64fed1a3341d18ef4d80b80da51060b Mon Sep 17 00:00:00 2001
From: Andrea Veri <av at gnome.org>
Date: Mon, 13 Apr 2015 12:01:10 +0200
Subject: Cherry-pick changes from 76ebedf and cb7dbf0


diff --git a/check-mk.spec b/check-mk.spec
index 6f7fe0d..50b0f79 100644
--- a/check-mk.spec
+++ b/check-mk.spec
@@ -126,9 +126,7 @@ install -m 755 check_mk_agent.linux %{buildroot}%{_bindir}/check_mk_agent
 install -m 755 check_mk_caching_agent.linux %{buildroot}%{_bindir}/check_mk_caching_agent
 
 # And finally remove the xinetd configuration files from /usr/share/check_mk/agents as they
-# have been installed on /etc/xinetd.d already. Do the same for the check_mk_agent files.
-rm %{buildroot}%{_datadir}/check_mk/agents/xinetd.conf
-rm %{buildroot}%{_datadir}/check_mk/agents/xinetd_caching.conf
+# have been installed on /etc/xinetd.d already.
 rm %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.linux
 rm %{buildroot}%{_datadir}/check_mk/agents/check_mk_caching_agent.linux
 
@@ -141,10 +139,7 @@ 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
-install -m 644 plugins/mk_logwatch %{buildroot}%{_datadir}/check-mk-agent/plugins
-# The j4p_performance plugin has been deprecated.
-# install -m 644 plugins/j4p_performance %%{buildroot}%%{_datadir}/check-mk-agent/plugins
-install -m 644 plugins/mk_oracle %{buildroot}%{_datadir}/check-mk-agent/plugins
+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.
@@ -239,6 +234,10 @@ rm -rf %{buildroot}%{_datadir}/check_mk/agents/z_os/
 rm %{buildroot}%{_datadir}/check_mk/agents/plugins/j4p_performance
 rm -rf %{buildroot}%{_docdir}/check_mk/treasures/deprecated/
 
+# Remove the previously installed check-mk-agent xinetd files
+rm %{buildroot}%{_datadir}/check_mk/agents/xinetd.conf
+rm %{buildroot}%{_datadir}/check_mk/agents/xinetd_caching.conf
+
 # Remove the documentation for agents we are not going to package
 rm -rf %{buildroot}%{_docdir}/check_mk/agents/
 
@@ -370,6 +369,9 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
 - Filter the /usr/bin/bash require on EL 6 as it's available under /bin/bash,
   additionally fix the /usr/bin/pnp shebang from the plugins/unitrends_backup file
   as that is a non-existent binary file, upstream probably meant php.
+- PLUGINSDIR on the check_mk_agent binary file is set to be
+  %%{_datadir}/check-mk-agent/plugins, make sure all the plugins are installed
+  there and not on %%{_datadir}/check_mk/plugins instead.
 
 * Tue Sep 30 2014 Andrea Veri <averi at fedoraproject.org> - 1.2.4p5-2
 - Do not require any other shell than bash since that's the default
-- 
cgit v0.10.2


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