averi pushed to check-mk (f21). "setup.sh runs after the agent installation, make sure the removal of already copied files happens after its run"

[notifications at fedoraproject.org]

>From 3f06180d7277e6f8e097b1ad5c1397362d8d72b2 Mon Sep 17 00:00:00 2001
From: Andrea Veri <av at gnome.org>
Date: Mon, 13 Apr 2015 12:02:39 +0200
Subject: setup.sh runs after the agent installation, make sure the removal of
 already copied files happens after its run


diff --git a/check-mk.spec b/check-mk.spec
index 50b0f79..25a1a9a 100644
--- a/check-mk.spec
+++ b/check-mk.spec
@@ -125,11 +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.
-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
 
@@ -223,6 +218,8 @@ 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/check_mk_agent.linux
+rm %{buildroot}%{_datadir}/check_mk/agents/check_mk_caching_agent.linux
 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/
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/check-mk.git/commit/?h=f21&id=3f06180d7277e6f8e097b1ad5c1397362d8d72b2