- use %service, adapterized

Changed files:
    pure-ftpd.spec -> 1.146

diff --git a/pure-ftpd.spec b/pure-ftpd.spec
index 5ced6bb321051035c3ec7a511fe807e6488296c4..ea743e949e54b32aab28f37ecd99978096c6da5e 100644 (file)
--- a/pure-ftpd.spec
+++ b/pure-ftpd.spec
@@ -41,15 +41,16 @@ URL:                http://www.pureftpd.org/
 %{?with_tls:BuildRequires:     openssl-devel}
 BuildRequires: pam-devel
 %{?with_pgsql:BuildRequires:   postgresql-devel}
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires(post,preun):  /sbin/chkconfig
 Requires:      pam >= 0.79.0
 %{!?with_extra:Requires:       perl-base}
 Requires:      rc-scripts
 Provides:      ftpserver
-Obsoletes:     ftpserver
 Obsoletes:     anonftp
 Obsoletes:     bftpd
 Obsoletes:     ftpd-BSD
+Obsoletes:     ftpserver
 Obsoletes:     glftpd
 Obsoletes:     heimdal-ftpd
 Obsoletes:     linux-ftpd
@@ -166,17 +167,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add %{name}
-if [ -f %{_var}/lock/subsys/%{name} ]; then
-       /etc/rc.d/init.d/%{name} restart 1>&2
-else
-       echo "Run \"/etc/rc.d/init.d/%{name} start\" to start PureFTPD daemon."
-fi
+%service %{name} restart "PureFTPD daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-       if [ -f %{_var}/lock/subsys/%{name} ]; then
-               /etc/rc.d/init.d/%{name} stop 1>&2
-       fi
+       %service %{name} stop
        /sbin/chkconfig --del %{name}
 fi