- 1.552: %nagios_nrpe with a restart of nrpe daemon on install

Changed files:
    rpm-build-macros.spec -> 1.248
    rpm.macros -> 1.552

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 8374d6654d252f9c5520e7bfed2a379c7fa2d3ea..51e195f7ec135fffeb2ce22cc999698ac36fb06b 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define                rpm_macros_rev  1.550
+%define                rpm_macros_rev  1.552
 %define                find_lang_rev   1.32
 Summary:       PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD

diff --git a/rpm.macros b/rpm.macros
index 9c21b92d516257f3f0958f8a1e3f94fe40370122..8e7451c5720ae5ee4877fcb4546c61cf658d4c1f 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -1822,19 +1822,22 @@ else: \
 #
 # Requirements:
 # BuildRequires:       sed >= 4.0
-# BuildRequires:       rpmbuild(macros) >= 1.551
+# BuildRequires:       rpmbuild(macros) >= 1.552
 %nagios_nrpe(a:d:c:f:) {\
+       m=$(md5sum < /etc/nagios/nrpe.cfg); \
        %{-a:# on -a and config exists \
-       if [ "%{-a*}" -a -f /etc/nagios/nrpe.cfg ]; then \
-               if ! grep -q '^command\[%{-a*}\]' /etc/nagios/nrpe.cfg; then \
-                               sed -ne 's/^[ \t]*command_line[ \t]\+\(.\+\)/command[%{-a*}]=\1/p' %{-f*} >> /etc/nagios/nrpe.cfg; \
+       if [ -f /etc/nagios/nrpe.cfg ]; then \
+               if ! %{__grep} -q '^command\[%{-a*}\]' /etc/nagios/nrpe.cfg; then \
+                               %{__sed} -ne 's/^[ \t]*command_line[ \t]\+\(.\+\)/command[%{-a*}]=\1/p' %{-f*} >> /etc/nagios/nrpe.cfg; \
                fi; \
        fi;} \
        %{-d:# on package remove, -d and config exists \
-       if [ "$1" = "0" -a "%{-d*}" -a -f /etc/nagios/nrpe.cfg ]; then \
-               sed -i -e '/^[ \t]*command\[%{-d*}\]/d' /etc/nagios/nrpe.cfg; \
+       if [ "$1" = "0" -a -f /etc/nagios/nrpe.cfg ]; then \
+               %{__sed} -i -e '/^[ \t]*command\[%{-d*}\]/d' /etc/nagios/nrpe.cfg; \
        fi;} \
+       if [ "$m" != "$(md5sum < /etc/nagios/nrpe.cfg)" ]; then \
+               %service -q nrpe restart; \
+       fi; \
 }%{nil}
 
-
 # vim:ts=4 sw=4 noet ft=spec