- updated to 3.2.5

[packages/spamassassin.git] / spamassassin.spec

diff --git a/spamassassin.spec b/spamassassin.spec
index 013b5bd088c4fb867f69f7611e41c7390ece23f3..82eb71cc9cfde3c7000843b5861a79f706b8125e 100644 (file)
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -11,12 +11,12 @@
 Summary:       A spam filter for email which can be invoked from mail delivery agents
 Summary(pl.UTF-8):     Filtr antyspamowy, przeznaczony dla programów dostarczających pocztę (MDA)
 Name:          spamassassin
-Version:       3.2.1
-Release:       4
-License:       Apache Software License v2
+Version:       3.2.5
+Release:       1
+License:       Apache v2.0
 Group:         Applications/Mail
 Source0:       http://www.apache.net.pl/spamassassin/source/%{pdir}-%{pnam}-%{version}.tar.bz2
-# Source0-md5: 7b2fdbcdca5e9a181d4bb1b17663c138
+# Source0-md5: 695f9107b240383e48df8938f2de334e
 Source1:       %{name}.sysconfig
 Source2:       %{name}-spamd.init
 Source3:       %{name}-default.rc
@@ -219,7 +219,6 @@ Requires:   perl-HTML-Parser >= 3
 Requires:      perl-IO-Socket-INET6 >= 2.51
 Requires:      perl-Mail-SPF-Query
 Requires:      perl-Sys-Hostname-Long
-Conflicts:     perl-Net-DNS < 0.50
 
 %description -n perl-Mail-SpamAssassin
 Mail::SpamAssassin is a Mail::Audit plugin to identify spam using text
@@ -248,6 +247,7 @@ export CFLAGS="%{rpmcflags}"
        INSTALLDIRS=vendor \
        PREFIX=%{_prefix} \
        SYSCONFDIR=%{_sysconfdir} \
+       DATADIR=%{_datadir}/spamassassin \
        ENABLE_SSL=yes \
        CONTACT_ADDRESS="postmaster@localhost" \
        PERL_BIN=%{__perl} < /dev/null
@@ -279,7 +279,7 @@ install %{SOURCE6} $RPM_BUILD_ROOT/etc/cron.d/sa-update
 install -d $RPM_BUILD_ROOT/var/lib/spamassassin/{%{sa_version},compiled/%{sa_version}}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/sa-update-keys
 touch $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/sa-update-keys/{pubring,secring,trustdb}.gpg
-cp -a compiled/%{sa_version} $RPM_BUILD_ROOT/var/lib/spamassassin/compiled
+cp -a compiled/*/%{sa_version} $RPM_BUILD_ROOT/var/lib/spamassassin/compiled
 
 rm -f $RPM_BUILD_ROOT{%{perl_archlib}/perllocal.pod,%{perl_vendorarch}/auto/Mail/SpamAssassin/.packlist,%{_mandir}/man3/spamassassin-run.*}