Merge branch 'master' into el6

This commit is contained in:
Nick Bebout 2012-01-24 19:10:48 -06:00
commit 5e577e0846

View File

@ -177,8 +177,8 @@ fi
%if !%{use_systemd} %if !%{use_systemd}
if [ $1 -eq 0 ] ; then if [ $1 -eq 0 ] ; then
/sbin/service znc stop >/dev/null 2>&1 /sbin/service znc stop >/dev/null 2>&1 || :
/sbin/chkconfig --del znc /sbin/chkconfig --del znc || :
fi fi
%endif %endif