Author: glen Date: Mon May 5 13:56:11 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- add %service -n
---- Files affected:
SOURCES:
rpm.macros (1.449 -> 1.450)
---- Diffs:
================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.449 SOURCES/rpm.macros:1.450
--- SOURCES/rpm.macros:1.449 Mon Apr 7 17:35:23 2008
+++ SOURCES/rpm.macros Mon May 5 15:56:05 2008
@@ -920,11 +920,17 @@
# /etc/sysconfig/rpm or per service /etc/sysconfig/SERVICE file.
#
# Usage:
-# %service [-q] SERVICE ACTION ["SERVICE NICE DESCRIPTION"]
+# %service [-q] [-n] SERVICE ACTION ["SERVICE NICE DESCRIPTION"]
#
# -q be silent when service isn't started (for scriplets restaring other
package's services)
+# -n NOOP mode, do not actually restart service
#
-%service(q) {{%(export quiet=%{-q:1}; /usr/lib/rpm/service_generator.sh %{*})
};}
+# Requirements:
+# BuildRequires: rpmbuild(macros) >= 1.268
+# Requires: rc-scripts
+# -n option:
+# BuildRequires: rpmbuild(macros) >= 1.450
+%service(qn) {{%(export noop=%{-n:1} quiet=%{-q:1};
/usr/lib/rpm/service_generator.sh %{*}) };}
# Java macros. based on jpackage macros.java
@@ -1410,6 +1416,9 @@
# %preun -p %remove_etc_shells -p /bin/sh /bin/pdksh
#
# -p (optional) -- specifies that result is embeded %post script (prepends
<lua> as first line)
+#
+# Requirements:
+# BuildRequires: rpmbuild(macros) >= 1.429
%add_etc_shells(p) %{-p:<lua>}\
t = {}\
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm.macros?r1=1.449&r2=1.450&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
