From: Scott Cantor <cantor.2@osu.edu>
Date: Wed, 1 Aug 2012 18:27:27 +0000 (+0000)
Subject: Remove extra service restart step
X-Git-Tag: 2.5.0~12
X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=a58026a349e9e924231556dc22dcb8c406bdeed8;p=shibboleth%2Fcpp-sp.git

Remove extra service restart step
---

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index 69849e1..207eeed 100644
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -227,15 +227,6 @@ fi
 
 	# This adds the proper /etc/rc*.d links for the script
 	/sbin/chkconfig --add shibd
-
-	# On upgrade, restart components if they're already running.
-	# This gets repeated now down in %postun, and the next release
-	# should remove this copy. If we yank it now, we'll break upgrades.
-	if [ "$1" -gt "1" ] ; then
-		/etc/init.d/shibd status 1>/dev/null && /etc/init.d/shibd restart 1>/dev/null
-		%{!?_without_builtinapache:/etc/init.d/httpd status 1>/dev/null && /etc/init.d/httpd restart 1>/dev/null}
-		exit 0
-	fi
 %endif
 %if "%{_vendor}" == "suse"
 	# This adds the proper /etc/rc*.d links for the script