SPECS: pop3vscan.spec - use %service

[glen]

Author: glen                         Date: Tue Mar 14 01:01:00 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service

---- Files affected:
SPECS:
   pop3vscan.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SPECS/pop3vscan.spec
diff -u SPECS/pop3vscan.spec:1.13 SPECS/pop3vscan.spec:1.14
--- SPECS/pop3vscan.spec:1.13	Mon Dec  5 00:17:15 2005
+++ SPECS/pop3vscan.spec	Tue Mar 14 02:00:55 2006
@@ -10,13 +10,13 @@
 # Source0-md5:	48783c81cf70590637993aa0082fa467
 Source1:	%{name}.init
 Patch0:		%{name}.conf-clamav.patch
-URL:		http://pop3vscan.sf.net/
+URL:		http://pop3vscan.sourceforge.net/
 BuildRequires:	pcre-devel
-Requires:	pcre
+BuildRequires:	rpmbuild(macros) >= 1.268
+Requires(post,preun):	/sbin/chkconfig
 Requires:	rc-scripts
 # FIXME: which package in PLD provides 'netfilter' ?
 #Requires:	netfilter
-Requires(post,preun):	/sbin/chkconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -51,17 +51,11 @@
 
 %post
 /sbin/chkconfig --add %{name}
-if [ -f /var/lock/subsys/%{name} ]; then
-	/etc/rc.d/init.d/%{name} restart 1>&2
-else
-	echo "Type \"/etc/rc.d/init.d/%{name} start\" to start inet server" 1>&2
-fi
+%service %{name} restart
 
 %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
 
@@ -80,6 +74,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2006/03/14 01:00:55  glen
+- use %service
+
 Revision 1.13  2005/12/04 23:17:15  glen
 - adapterized (sorted %verify flags)
 
@@ -103,8 +100,8 @@
 - BR:pcre-devel
 
 Revision 1.8  2004/01/18 23:08:11  hunter
--patch w/ example confing for clamav
--STBR
+- patch w/ example confing for clamav
+- STBR
 
 Revision 1.7  2003/09/19 10:05:06  ankry
 - commented out chkconfig - not supported in .init file
@@ -113,8 +110,8 @@
 - added chkconfig
 
 Revision 1.5  2003/08/23 13:49:14  hunter
--s/rc-inetd/rc-scripts
--init script written.
+- s/rc-inetd/rc-scripts
+- init script written.
 
 Revision 1.4  2003/08/22 09:16:54  ankry
 - use _sysconfdir macro
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/pop3vscan.spec?r1=1.13&r2=1.14&f=u