- sorted preamble, use %service

Changed files:
    bopm.spec -> 1.11

diff --git a/bopm.spec b/bopm.spec
index 96986578903b360bab4d32476ba41d8cfd4ec3f8..9ecdfc90f1e94aab7a0fdd8f457f0a3f395b86c0 100644 (file)
--- a/bopm.spec
+++ b/bopm.spec
@@ -2,8 +2,7 @@ Summary:        Open proxy monitor and blocker, designed for use with ircds
 Summary(pl):   Monitorowanie i blokowanie otwartych proxy do u¿ywania z ircd
 Name:          bopm
 Version:       3.1.2
-Release:       0.11
-Epoch:         0
+Release:       0.12
 License:       GPL
 Group:         Applications/Communications
 Source0:       http://static.blitzed.org/www.blitzed.org/bopm/files/%{name}-%{version}.tar.gz
@@ -15,15 +14,15 @@ URL:                http://www.blitzed.org/bopm/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
-BuildRequires: rpmbuild(macros) >= 1.202
-PreReq:                rc-scripts >= 0.4.0.17
+BuildRequires: rpmbuild(macros) >= 1.268
+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/useradd
-Requires(postun):      /usr/sbin/userdel
-Requires(postun):      /usr/sbin/groupdel
-Requires(post,preun):  /sbin/chkconfig
+Requires:      rc-scripts >= 0.4.0.17
 Provides:      group(%{name})
 Provides:      user(%{name})
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -52,7 +51,7 @@ BOPM jest w stanie wykry
 routery Cisco z domy¶lnymi has³ami. BOPM obs³uguje tak¿e sprawdzanie
 czarnych list opartych na DNS (takich jak MAPS RBL) i mo¿e byæ
 skonfigurowany do zg³aszania nowych proxy z powrotem do projektu
-Blitzed Open Proxy Monitoring. 
+Blitzed Open Proxy Monitoring.
 
 %prep
 %setup -q
@@ -94,17 +93,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 BOPM daemon."
-fi
+%service %{name} restart "BOPM 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