averi pushed to check-mk (el6). "Stop shipping the j4p_performance plugin as it's deprecated now. Additionally move all agents to the -agent subpackage"

[notifications at fedoraproject.org]

>From 58485a22c59551dba2bfe51b1e2e09e95ea0156e Mon Sep 17 00:00:00 2001
From: Andrea Veri <av at gnome.org>
Date: Wed, 17 Sep 2014 16:28:10 +0200
Subject: Stop shipping the j4p_performance plugin as it's deprecated now.
 Additionally move all agents to the -agent subpackage


diff --git a/check-mk.spec b/check-mk.spec
index 6853849..dbaeaa9 100644
--- a/check-mk.spec
+++ b/check-mk.spec
@@ -96,7 +96,8 @@ 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
-install -m 644 plugins/j4p_performance %{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
 install -m 644 plugins/sylo %{buildroot}%{_datadir}/check-mk-agent/plugins
 
@@ -185,6 +186,9 @@ rm -rf %{buildroot}%{_datadir}/check_mk/agents/solaris/
 rm -rf %{buildroot}%{_datadir}/check_mk/agents/hpux/
 rm -rf %{buildroot}%{_datadir}/check_mk/agents/sap/
 
+# Remove deprecated agent plugins.
+rm -rf %{buildroot}%{_datadir}/check_mk/agents/plugins/j4p_performance
+
 # Remove Windows files.
 rm -rf %{buildroot}%{_docdir}/check_mk/windows/
 rm -rf %{buildroot}%{_datadir}/check_mk/agents/windows/
@@ -227,7 +231,6 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
 %{_sysconfdir}/check_mk/First-Installation.txt
 %{_sysconfdir}/check_mk/conf.d
 %{_sysconfdir}/nagios/auth.serials
-%{_datadir}/check_mk/agents
 %{_datadir}/check_mk/modules
 %{_datadir}/check_mk/checks
 %{_datadir}/check_mk/pnp-templates
@@ -239,6 +242,7 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
 %doc COPYING ChangeLog AUTHORS
 
 %files agent
+%{_datadir}/check_mk/agents
 %{_bindir}/check_mk_agent
 %{_bindir}/waitmax
 %{_bindir}/mk-job
-- 
cgit v0.10.2


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