[check-mk] Add a fix-agents-conf-directories.patch that actually fixes the configuration files path of '/usr/bi

averi averi at fedoraproject.org
Thu Aug 29 16:24:16 UTC 2013


commit ebd4864a819e37b58a0a2a9145e5ff611c3373aa
Author: Andrea Veri <av at gnome.org>
Date:   Thu Aug 29 18:07:51 2013 +0200

    Add a fix-agents-conf-directories.patch that actually fixes the configuration files path of '/usr/bin/check_mk_agent'. Thanks 'Brainslug' for the patch. (BZ: #989793))

 check-mk.spec                     |    4 ++++
 fix-agents-conf-directories.patch |   13 +++++++++++++
 2 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/check-mk.spec b/check-mk.spec
index eb66e17..930445f 100644
--- a/check-mk.spec
+++ b/check-mk.spec
@@ -15,6 +15,7 @@ Requires:	mod_python
 Source1:	First-Installation.txt
 Source2:	defaults
 AutoReq:	0
+Patch0:		fix-agents-conf-directories.patch
 
 # Do not provide from a documentation
 %global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_docdir}/.*$
@@ -68,6 +69,7 @@ This package contains multisite.
 %prep
 %setup -q -n check_mk-%{version}
 tar xf agents.tar.gz
+%patch0 -p0
 
 %build
 rm -f waitmax
@@ -237,6 +239,8 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
 - Add an if statement for RHEL and make sure auto provides are not set
   automatically. (BZ #985285)
 - Requires set to mod_python on RHEL, no mod_wsgi migration yet on EPEL. (BZ: #987852)
+- Add a fix-agents-conf-directories.patch that actually fixes the configuration
+  files path of '/usr/bin/check_mk_agent'. Thanks 'Brainslug' for the patch. (BZ: #989793)
 
 * Fri Aug 02 2013 Petr Pisar <ppisar at redhat.com> - 1.2.2-5
 - Do not provide from a documentation
diff --git a/fix-agents-conf-directories.patch b/fix-agents-conf-directories.patch
new file mode 100644
index 0000000..c9d9350
--- /dev/null
+++ b/fix-agents-conf-directories.patch
@@ -0,0 +1,13 @@
+--- check_mk_agent.linux     2013-04-27 14:30:45.000000000 +0000
++++ /tmp/check_mk_agent 2013-07-30 00:14:53.512028116 +0000
+@@ -27,8 +27,8 @@
+ export LC_ALL=C
+ unset LANG
+ 
+-export MK_LIBDIR="/usr/lib/check_mk_agent"
+-export MK_CONFDIR="/etc/check_mk"
++export MK_LIBDIR="/usr/share/check-mk-agent"
++export MK_CONFDIR="/etc/check-mk-agent"
+ 
+ # Make sure, locally installed binaries are found
+ PATH=$PATH:/usr/local/bin


More information about the scm-commits mailing list