averi pushed to check-mk (el5). "Remove the previously installed check-mk-agent xinetd files"

notifications at fedoraproject.org notifications at fedoraproject.org
Mon Apr 13 09:56:02 UTC 2015


>From cb7dbf0eaef4e946ad11700fac46c39544174785 Mon Sep 17 00:00:00 2001
From: Andrea Veri <av at gnome.org>
Date: Mon, 13 Apr 2015 11:55:53 +0200
Subject: Remove the previously installed check-mk-agent xinetd files


diff --git a/check-mk.spec b/check-mk.spec
index 8c5c5d0..b82d2ea 100644
--- a/check-mk.spec
+++ b/check-mk.spec
@@ -107,9 +107,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
 
@@ -217,6 +215,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/
 
-- 
cgit v0.10.2


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


More information about the scm-commits mailing list