From 84c95215d56ac5ac4ee45ec9908167b3a6adeb7e Mon Sep 17 00:00:00 2001
From: Stephen Smoogen <smooge@redhat.com>
Date: Sep 19 2017 22:52:38 +0000
Subject: Fix conflict between nagios and nagios-contrib

Fix reload problem in nagios systemd

---

diff --git a/nagios.service b/nagios.service
index 72b6c8f..07a39cc 100644
--- a/nagios.service
+++ b/nagios.service
@@ -11,8 +11,9 @@ PIDFile=/var/run/nagios/nagios.pid
 # Verify Nagios config before start as upstream suggested
 ExecStartPre=/usr/sbin/nagios -v /etc/nagios/nagios.cfg
 ExecStart=/usr/sbin/nagios -d /etc/nagios/nagios.cfg
+ExecStop=/bin/kill -TERM ${MAINPID}
 ExecStopPost=/usr/bin/rm -f /var/spool/nagios/cmd/nagios.cmd
-
+ExecReload=/bin/kill -HUP ${MAINPID}
 
 [Install]
 WantedBy=multi-user.target
diff --git a/nagios.spec b/nagios.spec
index 1f2ca05..52aa685 100644
--- a/nagios.spec
+++ b/nagios.spec
@@ -2,7 +2,7 @@
 
 Name:           nagios
 Version:        4.3.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary: Host/service/network monitoring program
 
@@ -426,7 +426,6 @@ fi
 
 
 %files
-%dir %{_libdir}/%{name}/plugins/eventhandlers/
 %dir %{_libdir}/%{name}/cgi-bin
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/html
@@ -466,6 +465,7 @@ fi
 %dir %{_sysconfdir}/%{name}
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/plugins
+%dir %{_libdir}/%{name}/plugins/eventhandlers/
 %attr(0755,nagios,nagios) %dir %{_localstatedir}/spool/%{name}
 
 
@@ -481,10 +481,14 @@ fi
 
 %files contrib 
 %doc contrib/README.contrib
-%attr(0750,root,root) %{_libdir}/%{name}/plugins/eventhandlers/
+%attr(0750,root,root) %{_libdir}/%{name}/plugins/eventhandlers/*
 %{_libdir}/%{name}/cgi/
 
 %changelog
+* Tue Sep 19 2017 Stephen Smoogen <smooge@fedoraproject.org> - 4.3.4-3
+- Fix conflict between nagios and nagios-contrib
+- Fix reload problem in nagios systemd
+
 * Tue Sep 19 2017 Stephen Smoogen <smooge@fedoraproject.org> - 4.3.4-2
 - Merge patches from EPEL tree to master
 - Fix contrib entries