[cpp-sp COMMIT] /branches/REL_2/shibboleth.spec.in

[noreply at shibboleth.net]

Author: scantor
Date: Wed Aug  1 14:27:27 2012
New Revision: 3745

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3745&view=rev
Log:
Remove extra service restart step

Modified:
    branches/REL_2/shibboleth.spec.in

Modified: branches/REL_2/shibboleth.spec.in
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibboleth.spec.in?rev=3745&r1=3744&r2=3745&view=diff
==============================================================================
--- branches/REL_2/shibboleth.spec.in (original)
+++ branches/REL_2/shibboleth.spec.in Wed Aug  1 14:27:27 2012
@@ -227,15 +227,6 @@
 
 	# 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