- updated to 2.62

[packages/spamassassin.git] / spamassassin.spec

diff --git a/spamassassin.spec b/spamassassin.spec
index 817c13b9cca4cf71615ce6ef7a35243269b65bdc..0d9cd16651a4cb124aba8f42f96448d6330958a3 100644 (file)
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-# _with_tests - perform "make test"
+%bcond_with  tests     # perform "make test"
 #
 %include       /usr/lib/rpm/macros.perl
 %define        pdir    Mail
@@ -8,28 +8,30 @@
 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:       2.53
+Version:       2.62
 Release:       1
 License:       GPL v1+ or Artistic
 Group:         Applications/Mail
 Source0:       http://spamassassin.org/released/%{pdir}-%{pnam}-%{version}.tar.gz
+# Source0-md5: e0cf85b038d85bb83083ee474763ed3c
 Source1:       %{name}.sysconfig
 Patch0:                %{name}-rc-script.patch
 URL:           http://spamassassin.org/
-BuildRequires: perl >= 5.6
-BuildRequires: rpm-perlprov >= 4.0.2-104
-BuildRequires: openssl-devel >= 0.9.6j
-%if %{?_with_tests:1}0
+BuildRequires: openssl-devel >= 0.9.6k
+BuildRequires: perl-devel >= 5.6
+%if %{with tests}
 BuildRequires: perl-HTML-Parser >= 3
 # are these really needed?
 BuildRequires: perl-MailTools
+BuildRequires: perl-Mail-Audit
 BuildRequires: perl-MIME-Base64
 BuildRequires: perl-MIME-tools
 %endif
+BuildRequires: rpm-perlprov >= 4.0.2-104
 Prereq:                /sbin/chkconfig
 Requires:      perl-Mail-SpamAssassin >= %{version}
-Buildroot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     SpamAssassin
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _noautoreq      'perl(Razor2::Client::Agent)' 'perl(Razor::Agent)' 'perl(Razor::Client)' 'perl(DBI)'
 
@@ -133,19 +135,20 @@ stworzon
 oznaczona jako spam w celu pó¼niejszego wyfiltrowania, np. przy u¿yciu
 aplikacji do czytania poczty.
 
-%prep -q
+%prep
 %setup -q -n %{pdir}-%{pnam}-%{version}
 %patch0 -p0
 
 %build
+echo "postmaster@localhost" | \
 %{__perl} Makefile.PL \
        PREFIX=%{_prefix} \
        SYSCONFDIR=%{_sysconfdir} \
-< /dev/null
-
+       RUN_RAZOR1_TESTS=0 \
+       RUN_RAZOR2_TESTS=0
 %{__make} OPTIMIZE="%{rpmcflags}"
 
-%{?_with_tests:%{__make} test}
+%{?with_tests:%{__make} test}
 
 %install
 rm -rf $RPM_BUILD_ROOT