- use %service

Changed files:
    ejabberd.spec -> 1.19

diff --git a/ejabberd.spec b/ejabberd.spec
index d271be79f78c08e4077908b300b46fb2da771292..6d82e729e643456e83e2a1402dc550b9bc686445 100644 (file)
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -20,8 +20,9 @@ BuildRequires:        autoconf
 BuildRequires: erlang >= R9C
 BuildRequires: expat-devel >= 1.95
 BuildRequires: openssl-devel
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires(post):        /usr/bin/perl
-Requires(post): jabber-common
+Requires(post):        jabber-common
 Requires(post):        textutils
 Requires(post,preun):  /sbin/chkconfig
 Requires:      erlang
@@ -83,17 +84,11 @@ if [ ! -f /etc/jabber/cookie ] ; then
 fi
 
 /sbin/chkconfig --add ejabberd
-if [ -r /var/lock/subsys/ejabberd ]; then
-       /etc/rc.d/init.d/ejabberd restart >&2
-else
-       echo "Run \"/etc/rc.d/init.d/ejabberd start\" to start ejabberd server."
-fi
+%service ejabberd restart "ejabberd server"
 
 %preun
 if [ "$1" = "0" ]; then
-       if [ -r /var/lock/subsys/ejabberd ]; then
-               /etc/rc.d/init.d/ejabberd stop >&2
-       fi
+       %service ejabberd stop
        /sbin/chkconfig --del ejabberd
 fi