packages: rpm-build-macros/rpm-build-macros.spec, rpm-build-macros/rpm.macr...

[glen]

Author: glen                         Date: Thu Mar 18 10:59:42 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 1.552: %nagios_nrpe with a restart of nrpe daemon on install

---- Files affected:
packages/rpm-build-macros:
   rpm-build-macros.spec (1.247 -> 1.248) , rpm.macros (1.551 -> 1.552) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm-build-macros.spec
diff -u packages/rpm-build-macros/rpm-build-macros.spec:1.247 packages/rpm-build-macros/rpm-build-macros.spec:1.248
--- packages/rpm-build-macros/rpm-build-macros.spec:1.247	Sat Mar 13 23:32:45 2010
+++ packages/rpm-build-macros/rpm-build-macros.spec	Thu Mar 18 11:59:37 2010
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-%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
@@ -90,6 +90,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.248  2010/03/18 10:59:37  glen
+- 1.552: %nagios_nrpe with a restart of nrpe daemon on install
+
 Revision 1.247  2010/03/13 22:32:45  arekm
 - better fix
 

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.551 packages/rpm-build-macros/rpm.macros:1.552
--- packages/rpm-build-macros/rpm.macros:1.551	Thu Mar 18 11:32:31 2010
+++ packages/rpm-build-macros/rpm.macros	Thu Mar 18 11:59:37 2010
@@ -1822,19 +1822,22 @@
 #
 # 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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm-build-macros.spec?r1=1.247&r2=1.248&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.551&r2=1.552&f=u