diff -r b8e8f9dbbfd3 -r c158bb6622e1 spamassassin/spamassassin.spec --- a/spamassassin/spamassassin.spec Wed Sep 21 13:51:49 2011 +0200 +++ b/spamassassin/spamassassin.spec Wed Sep 21 13:55:11 2011 +0200 @@ -1,6 +1,6 @@ ## ## spamassassin.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2009 OpenPKG Foundation e.V. +## Copyright (c) 2000-2011 OpenPKG Foundation e.V. ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that @@ -22,9 +22,9 @@ ## # package version -%define V_real 3.2.5 -%define V_here 3.2.5 -%define V_sdir 3.2.5 +%define V_real 3.3.1 +%define V_here 3.3.1 +%define V_sdir 3.3.1 # package information Name: spamassassin @@ -37,7 +37,7 @@ Group: Mail License: ASF Version: %{V_here} -Release: 20090420 +Release: 20110914 # package options %option with_fsl yes @@ -47,14 +47,15 @@ Source1: rc.spamassassin Source2: local.cf Source3: fsl.spamassassin +Patch0: spamassassin.patch # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} BuildPreReq: OpenPKG, openpkg >= 20060823, perl, perl-openpkg >= 5.8.4, make -PreReq: OpenPKG, openpkg >= 20060823, perl -BuildPreReq: perl-db, perl-crypto, perl-xml, perl-dns -PreReq: perl-db, perl-crypto, perl-xml, perl-dns +PreReq: OpenPKG, openpkg >= 20060823, perl, gnupg +BuildPreReq: perl-db, perl-crypto, perl-xml, perl-dns, perl-locale, perl-www +PreReq: perl-db, perl-crypto, perl-xml, perl-dns, perl-locale, perl-www %if "%{with_fsl}" == "yes" BuildPreReq: fsl PreReq: fsl @@ -80,6 +81,7 @@ %prep %setup -q -n Mail-SpamAssassin-%{V_sdir} + %patch -p0 %build # configure package @@ -114,7 +116,6 @@ # create directories for PID file and virtual users %{l_shtool} mkdir -f -p -m 755 \ - $RPM_BUILD_ROOT%{l_prefix}/var/spamassassin \ $RPM_BUILD_ROOT%{l_prefix}/var/spamassassin/spool # strip installation