- 1.631: when service restart was disabled, print restart message

Changed files:
    rpm-build-macros.spec -> 1.313
    rpm.macros -> 1.632
    service_generator.sh -> 1.11

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 090086ed775c2075930960b459eda2307fc6aaef..4269c2531c24f3b344e91db71cd110d7bcd8499b 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%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

diff --git a/rpm.macros b/rpm.macros
index 967bb880354034ad8f3e2382bb731d00e6212c80..8093b1fd1861c0ae637f1dbd5029adf8ef9f200d 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -1244,8 +1244,7 @@ fi \
 # 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
 #

diff --git a/service_generator.sh b/service_generator.sh
index 2519854ae186b85c368c64613bf6a5ffb92586fa..19406f1122b33442510ff04746f82519254096f0 100644 (file)
--- a/service_generator.sh
+++ b/service_generator.sh
@@ -56,6 +56,13 @@ if [ "$check" = 1 ]; then
        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