SPECS (RA-branch): spamassassin.spec - merged update to 3.1.0 from...

[hawk]

Author: hawk                         Date: Mon Oct 17 19:00:12 2005 GMT
Module: SPECS                         Tag: RA-branch
---- Log message:
- merged update to 3.1.0 from HEAD revision 1.84
- release 3 for Ra

---- Files affected:
SPECS:
   spamassassin.spec (1.20.2.30 -> 1.20.2.31) 

---- Diffs:

================================================================
Index: SPECS/spamassassin.spec
diff -u SPECS/spamassassin.spec:1.20.2.30 SPECS/spamassassin.spec:1.20.2.31
--- SPECS/spamassassin.spec:1.20.2.30	Mon Jun  6 23:41:33 2005
+++ SPECS/spamassassin.spec	Mon Oct 17 21:00:06 2005
@@ -9,19 +9,32 @@
 Summary:	A spam filter for email which can be invoked from mail delivery agents
 Summary(pl):	Filtr antyspamowy, przeznaczony dla programów dostarczających pocztę (MDA)
 Name:		spamassassin
-Version:	3.0.4
-Release:	2
+Version:	3.1.0
+Release:	3
 License:	Apache Software License v2
 Group:		Applications/Mail
 Source0:	http://www.apache.org/dist/spamassassin/source/%{pdir}-%{pnam}-%{version}.tar.bz2
-# Source0-md5:	ba6e1bd95f6f9f3882f73212a11dbe46
+# Source0-md5:	d28bd7e83d01b234144e336bbfde0caa
 Source1:	%{name}.sysconfig
 Source2:	%{name}-spamd.init
+Patch0:		%{name}-bug-4619.patch
 URL:		http://spamassassin.apache.org/
 BuildRequires:	openssl-devel >= 0.9.6m
 BuildRequires:	perl-devel >= 1:5.6.1
+BuildRequires:	perl-Archive-Tar
+BuildRequires:	perl-DB_File
+BuildRequires:	perl-Net-DNS
+BuildRequires:	perl-Mail-SPF-Query
+BuildRequires:	perl-IP-Country
+BuildRequires:	perl-Net-Ident
+BuildRequires:	perl-IO-Socket-INET6 >= 2.51
+BuildRequires:	perl-IO-Socket-SSL
+BuildRequires:	perl-IO-Zlib
+BuildRequires:	perl-DBI
 BuildRequires:	perl-Digest-SHA1 >= 2.10
 BuildRequires:	perl-HTML-Parser >= 3
+#BuildRequires:	perl-Razor2
+BuildRequires:	perl-libwww
 %if %{with tests}
 # are these really needed?
 BuildRequires:	perl-MailTools
@@ -29,8 +42,7 @@
 BuildRequires:	perl-MIME-tools
 %endif
 BuildRequires:	rpm-perlprov >= 4.0.2-112.1
-Requires:	perl-Mail-SpamAssassin >= %{version}
-Requires:	perl-Unicode-MapUTF8
+Requires:	perl-Mail-SpamAssassin = %{version}-%{release}
 Obsoletes:	SpamAssassin
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -78,6 +90,7 @@
 Group:		Applications/Mail
 PreReq:		rc-scripts
 Requires(post,preun):	/sbin/chkconfig
+Requires:	perl-Mail-SpamAssassin = %{version}-%{release}
 
 %description spamd
 The purpose of this program is to provide a daemonized version of the
@@ -120,6 +133,10 @@
 Group:		Development/Languages/Perl
 Requires:	perl-HTML-Parser >= 3
 Requires:	perl-Cache-DB_File >= 0.2
+Requires:	perl-Sys-Hostname-Long
+Requires:	perl-Mail-SPF-Query
+Conflicts:	perl-Net-DNS < 0.50
+Conflicts:	perl-IO-Socket-INET6 < 2.51
 
 %description -n perl-Mail-SpamAssassin
 Mail::SpamAssassin is a Mail::Audit plugin to identify spam using text
@@ -140,15 +157,15 @@
 
 %prep
 %setup -q -n %{pdir}-%{pnam}-%{version}
+%patch0 -p0
 
 %build
-echo "postmaster at localhost" | \
 %{__perl} Makefile.PL \
 	PREFIX=%{_prefix} \
 	SYSCONFDIR=%{_sysconfdir} \
 	ENABLE_SSL=yes \
-	RUN_NET_TESTS=0 \
-	PERL_BIN=%{__perl}
+	CONTACT_ADDRESS="postmaster at localhost" \
+	PERL_BIN=%{__perl} < /dev/null
 %{__make} \
 	CC="%{__cc}" \
 	OPTIMIZE="%{rpmcflags}"
@@ -170,8 +187,6 @@
 # shouldn't this script be called `spamd' instead?
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/spamassassin
 
-rm -f spamd/{*.sh,*.conf,spam*} contrib/snp.tar.gz
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -194,21 +209,23 @@
 %files
 %defattr(644,root,root,755)
 %doc BUGS CREDITS Changes INSTALL README STATUS TRADEMARK UPGRADE USAGE
-%doc procmailrc.example sample*.txt
+%doc procmailrc.example
 %attr(755,root,root) %{_bindir}/sa-learn
+%attr(755,root,root) %{_bindir}/sa-update
 %attr(755,root,root) %{_bindir}/spamassassin
 %{_mandir}/man1/sa-learn*
+%{_mandir}/man1/sa-update*
 %{_mandir}/man1/spamassassin*
 
 %files tools
 %defattr(644,root,root,755)
-%doc sql tools masses contrib
+%doc sql ldap tools masses contrib
 
 %files spamd
 %defattr(644,root,root,755)
 %doc spamd/README*
 %attr(754,root,root) /etc/rc.d/init.d/spamassassin
-%attr(600,root,root) %config(noreplace) /etc/sysconfig/spamassassin
+%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/spamassassin
 %attr(755,root,root) %{_bindir}/spamd
 %{_mandir}/man1/spamd*
 
@@ -233,6 +250,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20.2.31  2005/10/17 19:00:06  hawk
+- merged update to 3.1.0 from HEAD revision 1.84
+- release 3 for Ra
+
 Revision 1.20.2.30  2005/06/06 21:41:33  hawk
 - release 2 for Ra
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/spamassassin.spec?r1=1.20.2.30&r2=1.20.2.31&f=u