SPECS: postgrey.spec - use %service, adapter

[glen]

Author: glen                         Date: Thu Apr 20 17:18:14 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service, adapter

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

---- Diffs:

================================================================
Index: SPECS/postgrey.spec
diff -u SPECS/postgrey.spec:1.13 SPECS/postgrey.spec:1.14
--- SPECS/postgrey.spec:1.13	Sun Jan 22 19:52:30 2006
+++ SPECS/postgrey.spec	Thu Apr 20 19:18:09 2006
@@ -3,11 +3,11 @@
 Summary:	Postfix Greylisting Policy Server
 Summary(pl):	Serwer do polityki "szarych list" dla Postfiksa
 Name:		postgrey
-Version: 	1.24
+Version:	1.24
 Release:	1
-License: 	GPL v2
-Group: 		Daemons
-Source0: 	http://isg.ee.ethz.ch/tools/postgrey/pub/%{name}-%{version}.tar.gz
+License:	GPL v2
+Group:		Daemons
+Source0:	http://isg.ee.ethz.ch/tools/postgrey/pub/%{name}-%{version}.tar.gz
 # Source0-md5:	db11f4da47ee28252cf2ddd160308d7e
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
@@ -15,6 +15,7 @@
 Patch1:		%{name}-postfix_dir.patch
 URL:		http://isg.ee.ethz.ch/tools/postgrey/
 BuildRequires:	rpm-perlprov
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	perl-IO-Multiplex
 Requires:	postfix
 BuildArch:	noarch
@@ -94,15 +95,13 @@
 /sbin/chkconfig --add %{name}
 
 %preun
-if [ $1 -eq 0 ]; then
-	if [ -f /var/lock/subsys/%{name} ]; then
-		/etc/rc.d/init.d/%{name} stop >&2
-	fi
-        /sbin/chkconfig --del %{name}
+if [ "$1" = 0 ]; then
+	%service %{name} stop
+	/sbin/chkconfig --del %{name}
 fi
 
 %postun
-if [ $1 -eq 0 ]; then
+if [ "$1" = 0 ]; then
 	%userremove postgrey
 	%groupremove postgrey
 	# should be done?:
@@ -115,7 +114,7 @@
 %config(noreplace) %verify(not md5 mtime size) %{confdir}/postgrey_whitelist_clients
 %config(noreplace) %verify(not md5 mtime size) %{confdir}/postgrey_whitelist_recipients
 %config(noreplace) %verify(not md5 mtime size) %{confdir}/postgrey_whitelist_clients.local
-%attr(640,root,postgrey) %config(noreplace) /etc/sysconfig/%{name}
+%attr(640,root,postgrey) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %attr(755,root,root) %{_sbindir}/postgrey*
 %dir %attr(711,postgrey,postgrey) %{_var}/spool/postfix/%{name}
@@ -126,6 +125,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2006/04/20 17:18:09  glen
+- use %service, adapter
+
 Revision 1.13  2006/01/22 18:52:30  hawk
 - updated to 1.24
 
================================================================

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