averi pushed to check-mk (epel7). "Cherry-pick changes from 77d9e9e and a902d18"

[notifications at fedoraproject.org]

>From 0ff98b6193f700d4ca879afb89327e53038641d5 Mon Sep 17 00:00:00 2001
From: Andrea Veri <av at gnome.org>
Date: Mon, 13 Apr 2015 12:10:16 +0200
Subject: Cherry-pick changes from 77d9e9e and a902d18


diff --git a/check-mk.spec b/check-mk.spec
index 482c469..d70a944 100644
--- a/check-mk.spec
+++ b/check-mk.spec
@@ -125,13 +125,6 @@ install -d -m 755 %{buildroot}%{_bindir}
 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
-rm %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.linux
-rm %{buildroot}%{_datadir}/check_mk/agents/check_mk_caching_agent.linux
-
 # mk-job installation
 install -m 755 mk-job %{buildroot}%{_bindir}/mk-job
 
@@ -142,9 +135,7 @@ 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.
@@ -228,6 +219,7 @@ rm %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.netbsd
 rm %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.openbsd
 rm %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.openvms
 rm %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.solaris
+
 rm %{buildroot}%{_datadir}/check_mk/agents/mk-job.solaris
 rm -rf %{buildroot}%{_datadir}/check_mk/agents/solaris/
 rm -rf %{buildroot}%{_datadir}/check_mk/agents/hpux/
@@ -239,6 +231,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/
 
@@ -252,7 +248,8 @@ rm -rf %{buildroot}%{_datadir}/check_mk/agents/windows/
 rm %{buildroot}%{_datadir}/check_mk/agents/check-mk-agent-%{version}-%{nodistrelease}.noarch.rpm
 rm %{buildroot}%{_datadir}/check_mk/agents/check-mk-agent.spec
 rm %{buildroot}%{_datadir}/check_mk/agents/check-mk-agent_%{version}-%{nodistrelease}_all.deb
-
+rm %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.linux
+rm %{buildroot}%{_datadir}/check_mk/agents/check_mk_caching_agent.linux
 # Remove waitmax and its leftarounds from the wrong directory, the binary is being
 # built and installed into the check-mk-agent's package already.
 rm %{buildroot}%{_datadir}/check_mk/agents/waitmax
@@ -370,6 +367,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=epel7&id=0ff98b6193f700d4ca879afb89327e53038641d5