use --with-piddir

[packages/nagios-nrpe.git] / nagios-nrpe.spec

diff --git a/nagios-nrpe.spec b/nagios-nrpe.spec
index e5fd9d90b223ee0edbe8c26c3eecf594027140e6..e505f95f09ba82a52d9e0955600aeff4f63d5690 100644 (file)
--- a/nagios-nrpe.spec
+++ b/nagios-nrpe.spec
@@ -1,12 +1,12 @@
 Summary:       Nagios remote plugin execution service/plugin
 Summary(pl.UTF-8):     Demon i wtyczka zdalnego wywoływania wtyczek Nagios
 Name:          nagios-nrpe
-Version:       2.15
-Release:       4
+Version:       3.0
+Release:       2
 License:       GPL v2
 Group:         Networking
 Source0:       http://downloads.sourceforge.net/nagios/nrpe-%{version}.tar.gz
-# Source0-md5: 3921ddc598312983f604541784b35a50
+# Source0-md5: e2e8e0bcd9a3924b0ea94e76500f147b
 Source1:       nrpe.init
 Source2:       nrpe-command.cfg
 Source3:       %{name}.tmpfiles
@@ -19,7 +19,7 @@ BuildRequires:        openssl-tools
 BuildRequires: rpmbuild(macros) >= 1.647
 Requires(post,preun):  /sbin/chkconfig
 Requires:      nagios-common
-Requires:      rc-scripts
+Requires:      rc-scripts >= 0.4.1.26
 Provides:      nagios-core
 Obsoletes:     netsaint-nrpe
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -27,7 +27,6 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _sysconfdir     /etc/nagios
 %define                _datadir        %{_prefix}/share/%{name}
 %define                _plugindir      %{_libdir}/nagios/plugins
-%define                _libexecdir     %{_plugindir}
 %define                _localstatedir  %{_var}/log/nagios
 %define                nsport          5666
 
@@ -74,6 +73,7 @@ na innych komputerach za pomocą demona nrpe.
        --with-nrpe-port=%{nsport} \
        --with-nrpe-user=nagios \
        --with-nrpe-group=nagios \
+       --with-piddir=/var/run/nrpe \
        --enable-ssl \
        --with-ssl-lib=%{_libdir} \
        --enable-command-args
@@ -109,18 +109,24 @@ if [ "$1" = "0" ] ; then
        /sbin/chkconfig --del nrpe
 fi
 
-%triggerpostun -- %{name} < 2.15-4
+%triggerpostun -- %{name} < 2.15-5
 # skip *this* trigger on downgrade
 [ $1 -le 1 ] && exit 0
 
+# ensure there's include_dir directive
+if ! grep -q '^include_dir=%{_sysconfdir}/nrpe.d' %{_sysconfdir}/nrpe.cfg; then
+       echo 'include_dir=%{_sysconfdir}/nrpe.d' >> %{_sysconfdir}/nrpe.cfg
+fi
+
 # check if need to migrate
-grep -q '^command\['  %{_sysconfdir}/nrpe.cfg || exit 0
+grep -q '^command\[' %{_sysconfdir}/nrpe.cfg || exit 0
 
 # move command definitions to separate file
 mv -f  %{_sysconfdir}/nrpe.d/commands.cfg{,.rpmnew}
 grep '^command\['  %{_sysconfdir}/nrpe.cfg > %{_sysconfdir}/nrpe.d/commands.cfg
 cp -f %{_sysconfdir}/nrpe.cfg{,.rpmsave}
 sed -i -e '/^command\[/d' %{_sysconfdir}/nrpe.cfg
+
 %service nrpe restart
 
 %triggerpostun -- %{name} < 2.6-1.1
@@ -135,7 +141,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc Changelog LEGAL README* SECURITY
+%doc Changelog LEGAL README* SECURITY.md update-cfg.pl
 %attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nrpe.cfg
 %attr(750,root,nagios) %dir %{_sysconfdir}/nrpe.d
 %attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nrpe.d/commands.cfg