[check-mk/f20] Fix the perl command that was doing the needed substitution on the /usr/bin/check_mk_agent's configu

[averi]

commit 138be7f1709ed8dd3af38a9f349367444afc34f7
Author: Andrea Veri <av at gnome.org>
Date:   Sat Aug 31 12:45:55 2013 +0200

    Fix the perl command that was doing the needed substitution on the /usr/bin/check_mk_agent's configuration directories. Thanks Brainslug for the report. (BZ: #989793) No need for the patch, seems Gianluca had a fix ready from the very initial commit.)

 check-mk.spec                     |   11 +++++------
 fix-agents-conf-directories.patch |   13 -------------
 2 files changed, 5 insertions(+), 19 deletions(-)
---
diff --git a/check-mk.spec b/check-mk.spec
index ceb4ec8..7003382 100644
--- a/check-mk.spec
+++ b/check-mk.spec
@@ -16,7 +16,6 @@ Source1:	First-Installation.txt
 Source2:	defaults
 Source3:	defaults.py
 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}/.*$
@@ -70,7 +69,6 @@ This package contains multisite.
 %prep
 %setup -q -n check_mk-%{version}
 tar xf agents.tar.gz
-%patch0 -p0
 
 %build
 rm -f waitmax
@@ -101,8 +99,8 @@ install -d -m 755 %{buildroot}%{_sysconfdir}/check-mk-agent
 install -m 644 logwatch.cfg %{buildroot}%{_sysconfdir}/check-mk-agent
 
 perl -pi \
-    -e 's|LIBDIR="/to/be/changed"|LIBDIR="%{_datadir}/check-mk-agent"|;' \
-    -e 's|CONFDIR="/to/be/changed"|CONFDIR="%{_sysconfdir}/check-mk-agent"|;' \
+    -e 's|LIBDIR="/usr/lib/check_mk_agent"|LIBDIR="%{_datadir}/check-mk-agent"|;' \
+    -e 's|CONFDIR="/etc/check_mk"|CONFDIR="%{_sysconfdir}/check-mk-agent"|;' \
     %{buildroot}%{_bindir}/check_mk_agent
 
 # Server, livestatus and other modules installation
@@ -244,8 +242,9 @@ 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)
+- Fix the perl command that was doing the needed substitution on the 
+  /usr/bin/check_mk_agent's configuration directories. Thanks Brainslug for the
+  report. (BZ: #989793)
 - In addition to a customized 'defaults' file, add a defaults.py accordingly. (BZ: #987859)
 
 * Fri Aug 02 2013 Petr Pisar <ppisar at redhat.com> - 1.2.2-5