averi pushed to check-mk (master). "Get rid of plugins from unsupported archs of operating systems (..more)"

[notifications at fedoraproject.org]

>From ab3e754517b7343f43959bfc52e32f1e13f68be7 Mon Sep 17 00:00:00 2001
From: Andrea Veri <av at gnome.org>
Date: Tue, 5 May 2015 16:09:13 +0200
Subject: Get rid of plugins from unsupported archs of operating systems

But make sure mk_logins is installed to prevent check-mk-agent to
complain with a 'Missing agent section' warning.

diff --git a/check-mk.spec b/check-mk.spec
index cbb0ab4..979e1d8 100644
--- a/check-mk.spec
+++ b/check-mk.spec
@@ -201,6 +201,37 @@ mkdir -p %{buildroot}%{_datadir}/check-mk-agent/available-plugins/
 cp -r %{buildroot}%{_datadir}/check_mk/agents/plugins/* %{buildroot}%{_datadir}/check-mk-agent/available-plugins/
 rm -rf %{buildroot}%{_datadir}/check_mk/agents/plugins/
 
+# Remove other operating systems and unsupported archs plugins from the available set of plugins
+rm %{buildroot}%{_datadir}/check-mk-agent/available-plugins/mk_oracle.solaris
+rm %{buildroot}%{_datadir}/check-mk-agent/available-plugins/mk_oracle_asm
+rm %{buildroot}%{_datadir}/check-mk-agent/available-plugins/mk_oracle_crs
+rm %{buildroot}%{_datadir}/check-mk-agent/available-plugins/netstat.aix
+rm %{buildroot}%{_datadir}/check-mk-agent/available-plugins/nfsexports.solaris
+rm %{buildroot}%{_datadir}/check-mk-agent/available-plugins/mk_logwatch_aix
+rm %{buildroot}%{_datadir}/check-mk-agent/available-plugins/mk_inventory.aix
+rm %{buildroot}%{_datadir}/check-mk-agent/available-plugins/mk_inventory.solaris
+
+# Rename Linux plugins
+mv %{buildroot}%{_datadir}/check-mk-agent/available-plugins/mk_inventory.linux %{buildroot}%{_datadir}/check-mk-agent/available-plugins/mk_inventory
+mv %{buildroot}%{_datadir}/check-mk-agent/available-plugins/netstat.linux %{buildroot}%{_datadir}/check-mk-agent/available-plugins/netstat
+
+# Do the same for the plugins of the -multisite subpackage
+rm %{buildroot}%{_datadir}/check_mk/web/plugins/mk_oracle.solaris
+rm %{buildroot}%{_datadir}/check_mk/web/plugins/mk_oracle_asm
+rm %{buildroot}%{_datadir}/check_mk/web/plugins/mk_oracle_crs
+rm %{buildroot}%{_datadir}/check_mk/web/plugins/netstat.aix
+rm %{buildroot}%{_datadir}/check_mk/web/plugins/nfsexports.solaris
+rm %{buildroot}%{_datadir}/check_mk/web/plugins/mk_logwatch_aix
+rm %{buildroot}%{_datadir}/check_mk/web/plugins/mk_inventory.aix
+rm %{buildroot}%{_datadir}/check_mk/web/plugins/mk_inventory.solaris
+
+mv %{buildroot}%{_datadir}/check_mk/web/plugins/mk_inventory.linux %{buildroot}%{_datadir}/check_mk/web/plugins/mk_inventory
+mv %{buildroot}%{_datadir}/check_mk/web/plugins/netstat.linux %{buildroot}%{_datadir}/check_mk/web/plugins/netstat
+
+# check-mk-agent seems to complain when mk_logins is not available on the custom
+# plugins directory. Make sure at least it gets installed in place.
+mv %{buildroot}%{_datadir}/check-mk-agent/available-plugins/mk_logins %{buildroot}%{_datadir}/check-mk-agent/plugins/mk_logins
+
 # 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
@@ -367,7 +398,9 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
 - Do not install all the plugins by default but make them available
   on a different directory. Users will then be able to symlink each
   of the plugins under the %%{_datadir}/check-mk-agent/plugins directory
-  and finally mark them as active. (BZ: #1218516)
+  and finally mark them as active. Make sure mk_logins is however
+  installed to prevent the agent to complain about it being missing. (BZ: #1218516)
+- Get rid of plugins from unsupported archs or operating systems.
 
 * Mon Apr 13 2015 Andrea Veri <averi at fedoraproject.org> - 1.2.6p1-1
 - New upstream release.
-- 
cgit v0.10.2


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