SPECS: amavis-ng.spec - use -f when testing for subsys lock, adapt...

[glen]

Author: glen                         Date: Thu Mar 23 19:35:16 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use -f when testing for subsys lock, adapterized

---- Files affected:
SPECS:
   amavis-ng.spec (1.38 -> 1.39) 

---- Diffs:

================================================================
Index: SPECS/amavis-ng.spec
diff -u SPECS/amavis-ng.spec:1.38 SPECS/amavis-ng.spec:1.39
--- SPECS/amavis-ng.spec:1.38	Mon May  2 20:23:50 2005
+++ SPECS/amavis-ng.spec	Thu Mar 23 20:35:11 2006
@@ -19,19 +19,19 @@
 BuildRequires:	perl-libnet
 BuildRequires:	rpm-perlprov
 BuildRequires:	rpmbuild(macros) >= 1.202
-Requires:	perl-Config-IniFiles
-Requires:	perl-File-MMagic
-Requires(pre):	/usr/bin/getgid
+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:	perl-Config-IniFiles
+Requires:	perl-File-MMagic
 Provides:	group(amavis)
 Provides:	user(amavis)
-Obsoletes:	amavisd
-Obsoletes:	amavis
 Obsoletes:	AMaViS
+Obsoletes:	amavis
+Obsoletes:	amavisd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # optionally used
@@ -103,8 +103,7 @@
 
 %triggerin -- courier
 chown -R daemon /var/{spool,log}/amavis-ng
-
-if [ -e /var/lock/subsys/courier ]; then
+if [ -f /var/lock/subsys/courier ]; then
 	%{_sbindir}/filterctl stop perlfilter
 	%{_sbindir}/filterctl start perlfilter
 fi
@@ -130,7 +129,7 @@
 %{perl_vendorlib}/AMAVIS.pm
 %{perl_vendorlib}/AMAVIS
 %{_mandir}/man1/*
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/logrotate.d/amavis-ng
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/amavis-ng
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -138,6 +137,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.39  2006/03/23 19:35:11  glen
+- use -f when testing for subsys lock, adapterized
+
 Revision 1.38  2005/05/02 18:23:50  glen
 - adapterized
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/amavis-ng.spec?r1=1.38&r2=1.39&f=u