SPECS: bopm.spec - sorted preamble, use %service

[glen]

Author: glen                         Date: Tue Jan 10 21:35:28 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- sorted preamble, use %service

---- Files affected:
SPECS:
   bopm.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SPECS/bopm.spec
diff -u SPECS/bopm.spec:1.10 SPECS/bopm.spec:1.11
--- SPECS/bopm.spec:1.10	Thu Jun  2 23:04:23 2005
+++ SPECS/bopm.spec	Tue Jan 10 22:35:22 2006
@@ -3,8 +3,7 @@
 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
@@ -16,15 +15,15 @@
 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)
@@ -53,7 +52,7 @@
 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
@@ -95,17 +94,11 @@
 
 %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
 
@@ -134,6 +127,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2006/01/10 21:35:22  glen
+- sorted preamble, use %service
+
 Revision 1.10  2005/06/02 21:04:23  ankry
 - sorted
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/bopm.spec?r1=1.10&r2=1.11&f=u