Author: glen Date: Wed Jan 4 05:09:09 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- 1.631: when service restart was disabled, print restart message
---- Files affected:
packages/rpm-build-macros:
rpm-build-macros.spec (1.312 -> 1.313) , rpm.macros (1.631 -> 1.632) ,
service_generator.sh (1.10 -> 1.11)
---- Diffs:
================================================================
Index: packages/rpm-build-macros/rpm-build-macros.spec
diff -u packages/rpm-build-macros/rpm-build-macros.spec:1.312
packages/rpm-build-macros/rpm-build-macros.spec:1.313
--- packages/rpm-build-macros/rpm-build-macros.spec:1.312 Thu Dec 22
13:46:23 2011
+++ packages/rpm-build-macros/rpm-build-macros.spec Wed Jan 4 06:09:03 2012
@@ -1,5 +1,5 @@
# $Revision$, $Date$
-%define rpm_macros_rev 1.631
+%define rpm_macros_rev 1.632
%define find_lang_rev 1.35
Summary: PLD Linux RPM build macros
Summary(pl.UTF-8): Makra do budowania pakietów RPM dla Linuksa PLD
@@ -92,6 +92,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.313 2012/01/04 05:09:03 glen
+- 1.631: when service restart was disabled, print restart message
+
Revision 1.312 2011/12/22 12:46:23 glen
- 1.630: cacti-0.8.7g/cacti-0.8.7h compat for %cacti_import_template
================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.631
packages/rpm-build-macros/rpm.macros:1.632
--- packages/rpm-build-macros/rpm.macros:1.631 Thu Dec 22 13:46:11 2011
+++ packages/rpm-build-macros/rpm.macros Wed Jan 4 06:09:03 2012
@@ -1244,8 +1244,7 @@
# 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 %{*}) };}
-
+%service(qn) {{%(export noop=%{-n:1} quiet=%{-q:1}
RPM_BUILD_ROOT=%{buildroot}; /usr/lib/rpm/service_generator.sh %{*}) };}
# Java macros. based on jpackage macros.java
#
================================================================
Index: packages/rpm-build-macros/service_generator.sh
diff -u packages/rpm-build-macros/service_generator.sh:1.10
packages/rpm-build-macros/service_generator.sh:1.11
--- packages/rpm-build-macros/service_generator.sh:1.10 Mon May 5 15:53:36 2008
+++ packages/rpm-build-macros/service_generator.sh Wed Jan 4 06:09:03 2012
@@ -56,6 +56,13 @@
skip_auto_restart_body
echo 'if [ $(skip_auto_restart) = no ]; then'
service_body
+ echo 'else'
+ # service restart was disabled, tell them to restart it
+ cat <<-EOF
+ if [ -f /var/lock/subsys/$service ]; then
+ echo 'Run "/sbin/service $service restart" to restart
$desc.'
+ fi
+ EOF
echo 'fi'
else
service_body
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm-build-macros.spec?r1=1.312&r2=1.313&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.631&r2=1.632&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/service_generator.sh?r1=1.10&r2=1.11&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
