SOURCES: rpm.macros - use helper script to generate %service

[glen]

Author: glen                         Date: Thu Dec  1 01:37:21 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use helper script to generate %service

---- Files affected:
SOURCES:
   rpm.macros (1.266 -> 1.267) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.266 SOURCES/rpm.macros:1.267
--- SOURCES/rpm.macros:1.266	Sun Nov 20 22:54:09 2005
+++ SOURCES/rpm.macros	Thu Dec  1 02:37:16 2005
@@ -782,20 +782,4 @@
 #
 #  -q be silent when service isn't started (for postun scriplets)
 #
-%service(q) {{ \
-# we use function, not to globber namespace with useless variables \
-skip_auto_restart() { \
-	. /etc/sysconfig/rpm; # global setting \
-	[ -f /etc/sysconfig/%1 ] && . /etc/sysconfig/%1; # per service setting \
-	echo ${RPM_SKIP_AUTO_RESTART:-no}; \
-}; \
-if [ -f /var/lock/subsys/%1 ]; then \
-	if [ $(skip_auto_restart) = no ]; then \
-		/etc/rc.d/init.d/%1 %2 1>&2; \
-%{!-q:else} \
-	%{!-q:echo 'Run "/etc/rc.d/init.d/%1 %2" to %2 %{!?3:%1 service}%{?3:%(set -- %{*}; echo "$3")}.';} \
-	fi \
-%{!-q:else} \
-	%{!-q:echo 'Run "/etc/rc.d/init.d/%1 start" to start %{!?3:%1 service}%{?3:%(set -- %{*}; echo "$3")}.';} \
-fi }; }
-
+%service(q) {{%(export quiet=%{-q:1}; sh /usr/lib/rpm/service_generator.sh %{*}); }}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.266&r2=1.267&f=u