- use %service

Changed files:
    freeradius.spec -> 1.59

diff --git a/freeradius.spec b/freeradius.spec
index 0d0d34a8f6d37b6eb9218908f3b85c7041c195dc..f328999b5bacd7efc6850f6bf1dcc46c691efff4 100644 (file)
--- a/freeradius.spec
+++ b/freeradius.spec
@@ -33,6 +33,7 @@ BuildRequires:        gdbm-devel
 BuildRequires: libltdl-devel
 BuildRequires: libtool
 BuildRequires: mysql-devel
+BuildRequires: net-snmp-devel
 BuildRequires: openldap-devel >= 2.3.0
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: pam-devel
@@ -41,22 +42,22 @@ BuildRequires:      postgresql-backend-devel
 BuildRequires: postgresql-devel
 BuildRequires: python
 BuildRequires: python-devel
-BuildRequires: net-snmp-devel
-BuildRequires: unixODBC-devel
 BuildRequires: rpm-perlprov
 BuildRequires: rpmbuild(macros) >= 1.202
-Requires(pre): /usr/bin/getgid
+BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: unixODBC-devel
+Requires(post,preun):  /sbin/chkconfig
+Requires(postun):      /usr/sbin/groupdel
+Requires(postun):      /usr/sbin/userdel
 Requires(pre): /bin/id
+Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
-Requires(pre): /usr/sbin/usermod
 Requires(pre): /usr/sbin/useradd
-Requires(postun):      /usr/sbin/userdel
-Requires(postun):      /usr/sbin/groupdel
-Requires(post,preun):  /sbin/chkconfig
+Requires(pre): /usr/sbin/usermod
 Requires:      perl(DynaLoader) = %(%{__perl} -MDynaLoader -e 'print DynaLoader->VERSION')
 Requires:      rc-scripts
-Provides:      user(radius)
 Provides:      group(radius)
+Provides:      user(radius)
 Obsoletes:     cistron-radius
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -164,17 +165,11 @@ fi
 
 %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 %{name} daemon."
-fi
+%service %{name} restart "%{name} 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