From 207c9ca4d45b701fc1d0b35f7c6fd6ce589a4c34 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Wed, 4 Jan 2012 05:09:03 +0000
Subject: [PATCH] - 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
---
 rpm-build-macros.spec | 2 +-
 rpm.macros            | 3 +--
 service_generator.sh  | 7 +++++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 090086e..4269c25 100644
--- 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 967bb88..8093b1f 100644
--- 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 2519854..19406f1 100644
--- 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
-- 
2.44.0