[JM-1211] Improved service handling in RPM (uninstalls and upgrades)

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@9661 b35dd754-fafc-0310-a699-88a17e54d16e

build/rpm/openfire.spec

@@ -76,14 +76,21 @@ rm -rf $RPM_BUILD_ROOT%{homedir}/resources/spank
 rm -rf $RPM_BUILD_ROOT
 
 %preun
-[ -x "/etc/init.d/openfire" ] && /etc/init.d/openfire stop
-if [ "$1" != 0 ]; then
+if [ "$1" == "0" ]; then
+	# This is an uninstall, instead of an upgrade.
 	/sbin/chkconfig --del openfire
+	[ -x "/etc/init.d/openfire" ] && /etc/init.d/openfire stop
 fi
 
 %post
-/sbin/chkconfig --add openfire
 chown -R daemon:daemon %{homedir}
+if [ "$1" == "1" ]; then
+	# This is a fresh install, instead of an upgrade.
+	/sbin/chkconfig --add openfire
+fi
+
+# Trigger a restart.
+[ -x "/etc/init.d/openfire" ] && /etc/init.d/openfire condrestart
 
 %files
 %defattr(-,daemon,daemon)