[check-mk/el6] Merge changes to el6.

[averi]

commit 1eef9a9cc28d669b3c6da275512dd23045a800ce
Author: Andrea Veri <av at gnome.org>
Date:   Sat Aug 31 12:57:41 2013 +0200

    Merge changes to el6.

 check-mk.spec |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/check-mk.spec b/check-mk.spec
index 936e613..7d78105 100644
--- a/check-mk.spec
+++ b/check-mk.spec
@@ -1,8 +1,8 @@
 %define _requires_exceptions pear(default.php)
 
 Name:		check-mk
-Version:	1.2.2
-Release:	5%{?dist}
+Version:	1.2.2p2
+Release:	1%{?dist}
 Summary:	A new general purpose Nagios-plugin for retrieving data
 Group:		Applications/Internet
 License:	GPLv2 and GPLv3
@@ -16,7 +16,6 @@ Source1:	First-Installation.txt
 Source2:	defaults
 Source3:	defaults.py
 AutoReq:	0
-Patch0:		fix-agents-conf-directories.patch
 
 %description
 check-mk is a general purpose Nagios-plugin for retrieving data. It adopts a
@@ -67,7 +66,6 @@ This package contains multisite.
 %prep
 %setup -q -n check_mk-%{version}
 tar xf agents.tar.gz
-%patch0 -p0
 
 %build
 rm -f waitmax
@@ -98,8 +96,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
@@ -197,7 +195,7 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
 %{_bindir}/mkp
 %{_bindir}/check_mk
 %config(noreplace) %{_sysconfdir}/check_mk/main.mk
-%config(noreplace) %{_sysconfdir}/check_mk/main.mk-1.2.2
+%config(noreplace) %{_sysconfdir}/check_mk/main.mk-1.2.2p2
 %{_sysconfdir}/check_mk/First-Installation.txt
 %{_sysconfdir}/check_mk/conf.d
 %{_datadir}/check_mk/agents
@@ -225,7 +223,7 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
 %files multisite
 %{_datadir}/check_mk/web
 %config(noreplace) %{_sysconfdir}/check_mk/multisite.mk
-%config(noreplace) %{_sysconfdir}/check_mk/multisite.mk-1.2.2
+%config(noreplace) %{_sysconfdir}/check_mk/multisite.mk-1.2.2p2
 %{_sysconfdir}/check_mk/multisite.d
 
 %files livestatus
@@ -244,14 +242,18 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
 %endif
 
 %changelog
+* Sat Aug 31 2013 Andrea Veri <averi at fedoraproject.org> - 1.2.2p2-1
+- New upstream release.
+
 * Thu Aug 29 2013 Andrea Veri <averi at fedoraproject.org> - 1.2.2-5
 - Make sure the waitmax binary gets built. Also thanks to John Reddy
   for his initial work on this. (BZ: #982769)
 - 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)
 
 * Sun Apr 28 2013 Andrea Veri <averi at fedoraproject.org> 1.2.2-4%{?dist}