[nrpe/f18] 860982 - Mistake in service file 860985 - nrpe tries to own directory owned by nagios-common

[tremble]

commit 7ae04c86993d8040a77ce978b31a558c658a0707
Author: Mark Chappell <mchappel at redhat.com>
Date:   Mon Jan 14 12:41:41 2013 +0100

    860982 - Mistake in service file
    860985 - nrpe tries to own directory owned by nagios-common

 nrpe.service |    2 +-
 nrpe.spec    |    9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/nrpe.service b/nrpe.service
index 7f2057d..4ed8357 100644
--- a/nrpe.service
+++ b/nrpe.service
@@ -8,7 +8,7 @@ Type=forking
 User=nrpe
 Group=nrpe
 EnvironmentFile=/etc/sysconfig/nrpe
-ExecStart=/usr/bin/nrpe -c /etc/nagios/nrpe.cfg -d $NRPE_SSL_OPT
+ExecStart=/usr/sbin/nrpe -c /etc/nagios/nrpe.cfg -d $NRPE_SSL_OPT
 
 [Install]
 WantedBy=multi-user.target
diff --git a/nrpe.spec b/nrpe.spec
index d1ed3ad..c810dd8 100644
--- a/nrpe.spec
+++ b/nrpe.spec
@@ -2,7 +2,7 @@
 
 Name: nrpe
 Version: 2.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Host/service/network monitoring agent for Nagios
 
 Group: Applications/System
@@ -36,6 +36,8 @@ Requires(preun): /sbin/service, /sbin/chkconfig
 Requires(post): /sbin/chkconfig, /sbin/service
 Requires(postun): /sbin/service
 Requires: initscripts
+# owns /etc/nagios
+Requires: nagios-common
 Provides: nagios-nrpe = %{version}-%{release}
 
 %description
@@ -165,7 +167,6 @@ chown -R %{name}:%{name} %{_localstatedir}/cache/%{name}
 %{_initrddir}/nrpe
 %endif
 %{_sbindir}/nrpe
-%dir %{_sysconfdir}/nagios
 %dir %{_sysconfdir}/nrpe.d
 %config(noreplace) %{_sysconfdir}/nagios/nrpe.cfg
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
@@ -181,6 +182,10 @@ chown -R %{name}:%{name} %{_localstatedir}/cache/%{name}
 %doc Changelog LEGAL README
 
 %changelog
+* Mon Jan 14 2013 Mark Chappell <tremble at tremble.org.uk> - 2.13-2
+- #860982 Mistake in service file
+- #860985 nrpe shouldn't own /etc/nagios (from nagios-common)
+
 * Mon Sep 17 2012 Peter Lemenkov <lemenkov at gmail.com> - 2.13-1
 - Ver. 2.13