SPECS: qmail-scanner.spec - fetch 2.00 - adapterized

[glen]

Author: glen                         Date: Wed Apr  5 10:35:19 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fetch 2.00
- adapterized

---- Files affected:
SPECS:
   qmail-scanner.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: SPECS/qmail-scanner.spec
diff -u SPECS/qmail-scanner.spec:1.25 SPECS/qmail-scanner.spec:1.26
--- SPECS/qmail-scanner.spec:1.25	Sun May  1 19:31:30 2005
+++ SPECS/qmail-scanner.spec	Wed Apr  5 12:35:14 2006
@@ -8,12 +8,12 @@
 Summary:	Content scanner for Qmail
 Summary(pl):	Skaner zawartości dla Qmaila
 Name:		qmail-scanner
-Version:	1.25
-Release:	0.12
+Version:	2.00
+Release:	0.1
 License:	GPL
-Group:		Applications/System
+Group:		Applications/Mail
 Source0:	http://dl.sourceforge.net/qmail-scanner/%{name}-%{version}.tgz
-# Source0-md5:	0117c425efb75208682fabcba4e1dd24
+# Source0-md5:	2833d295f5198e83b5f129993854d9f5
 Source1:	%{name}.conf
 Source2:	%{name}-report.sh
 Patch0:		%{name}-root.patch
@@ -34,13 +34,13 @@
 BuildRequires:	spamassassin
 BuildRequires:	spamassassin-spamc
 %endif
-Requires(pre):	/usr/bin/getgid
+Requires(post):	sed >= 4.0
+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(post):	sed >= 4.0
-Requires(postun):	/usr/sbin/userdel
-Requires(postun):	/usr/sbin/groupdel
 %{?with_clamav:Requires:	clamav}
 Requires:	fileutils
 Requires:	maildrop >= 1.3.8
@@ -49,8 +49,8 @@
 Requires:	spamassassin
 Requires:	spamassassin-spamc
 %endif
-Provides:	user(qscand)
 Provides:	group(qscand)
+Provides:	user(qscand)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -88,7 +88,7 @@
 %patch0 -p1
 # load sub-$SCANNER.pl if needed.
 %patch1 -p1
-# require /etc/qmail-scanner.conf
+# require %{_sysconfdir}/qmail-scanner.conf
 %patch2 -p1
 # make overriden vars as $our
 %patch3 -p1
@@ -191,13 +191,13 @@
 
 %post
 # setup vars once
-if grep -q MAILDOMAIN /etc/qmail-scanner.conf; then
-	cp -f /etc/qmail-scanner.conf{,.rpmsave}
+if grep -q MAILDOMAIN %{_sysconfdir}/qmail-scanner.conf; then
+	cp -f %{_sysconfdir}/qmail-scanner.conf{,.rpmsave}
 	hostname=$(hostname -f 2>/dev/null || echo localhost)
 	sed -i -e "
 		s/MAILDOMAIN/$hostname/g
 		s/USERNAME/root/g
-	" /etc/qmail-scanner.conf
+	" %{_sysconfdir}/qmail-scanner.conf
 fi
 
 # Initialize the version file.
@@ -271,6 +271,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2006/04/05 10:35:14  glen
+- fetch 2.00
+- adapterized
+
 Revision 1.25  2005/05/01 17:31:30  glen
 - use %useradd/%groupadd macros
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/qmail-scanner.spec?r1=1.25&r2=1.26&f=u