[check-mk] Make sure waitmax gets built and installed on the right directory.

[averi]

commit 5723746d58260b64ee3a103f06624ecf9596dc18
Author: Andrea Veri <av at gnome.org>
Date:   Thu Aug 29 17:43:26 2013 +0200

    Make sure waitmax gets built and installed on the right directory.

 check-mk.spec |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/check-mk.spec b/check-mk.spec
index 4025faa..fa4fc03 100644
--- a/check-mk.spec
+++ b/check-mk.spec
@@ -2,7 +2,7 @@
 
 Name:		check-mk
 Version:	1.2.2
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	A new general purpose Nagios-plugin for retrieving data
 Group:		Applications/Internet
 License:	GPLv2 and GPLv3
@@ -64,6 +64,8 @@ This package contains multisite.
 tar xf agents.tar.gz
 
 %build
+rm -f waitmax
+make waitmax
 
 %install
 
@@ -75,6 +77,9 @@ install -m 644 xinetd.conf %{buildroot}%{_sysconfdir}/xinetd.d/check-mk-agent
 install -d -m 755 %{buildroot}%{_bindir}
 install -m 755 check_mk_agent.linux %{buildroot}%{_bindir}/check_mk_agent
 
+# Waitmax's binary
+install -m 755 waitmax %{buildroot}%{_bindir}/waitmax
+
 install -d -m 755 %{buildroot}%{_datadir}/check-mk-agent
 install -d -m 755 %{buildroot}%{_datadir}/check-mk-agent/plugins
 install -d -m 755 %{buildroot}%{_datadir}/check-mk-agent/local
@@ -160,10 +165,10 @@ rm -rf %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.solaris
 rm -rf %{buildroot}%{_docdir}/check_mk/windows/
 rm -rf %{buildroot}%{_datadir}/check_mk/agents/windows/
 
-# Remove waitmax and its leftarounds, looks like it's a statically linked binary.
+# Remove waitmax and its leftarounds from the wrong directory, the binary is being
+# built and installed into the check-mk-agent's package already.
 rm %{buildroot}%{_datadir}/check_mk/agents/waitmax
 rm %{buildroot}%{_datadir}/check_mk/agents/waitmax.c
-rm %{buildroot}%{_datadir}/check_mk/agents/Makefile
 
 # Remove the packages directory.
 rm -rf %{buildroot}%{_localstatedir}/lib/check_mk/packages/
@@ -199,6 +204,7 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
 
 %files agent
 %{_bindir}/check_mk_agent
+%{_bindir}/waitmax
 %{_datadir}/check-mk-agent
 %config(noreplace) %{_sysconfdir}/xinetd.d/check-mk-agent
 %config(noreplace) %{_sysconfdir}/check-mk-agent
@@ -219,6 +225,10 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
 
 
 %changelog
+* Thu Aug 29 2013 Andrea Veri <averi at fedoraproject.org> - 1.2.2-6
+- Make sure the waitmax binary gets built. Also thanks to John Reddy
+  for his initial work on this. (BZ: #982769)
+
 * Fri Aug 02 2013 Petr Pisar <ppisar at redhat.com> - 1.2.2-5
 - Do not provide from a documentation