diff -r 10fbfbc9b548 -r 27f852b7efd2 spamassassin/spamassassin.spec --- a/spamassassin/spamassassin.spec Tue Aug 28 19:00:40 2012 +0200 +++ b/spamassassin/spamassassin.spec Tue Aug 28 19:00:50 2012 +0200 @@ -22,9 +22,9 @@ ## # package version -%define V_real 3.3.1 -%define V_here 3.3.1 -%define V_sdir 3.3.1 +%define V_real 3.3.2 +%define V_here 3.3.2 +%define V_sdir 3.3.2 # package information Name: spamassassin @@ -37,31 +37,26 @@ Group: Mail License: ASF Version: %{V_here} -Release: 20110914 +Release: 20120800 # package options %option with_fsl yes # list of sources -Source0: http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-%{V_real}.tar.gz +Source0: http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-%{V_real}.tar.bz2 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, gnupg +BuildPreReq: OpenPKG, openpkg >= 20100101, perl, perl-openpkg >= 5.8.4, make +PreReq: OpenPKG, openpkg >= 20100101, 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 %endif -AutoReq: no -AutoReqProv: no %description SpamAssassin provides you with a way to reduce if not completely @@ -76,12 +71,11 @@ prog spamassassin = { version = %{V_real} url = http://www.apache.org/dist/spamassassin/source/ - regex = Mail-SpamAssassin-(\d+\.\d+\.\d+)\.tar\.gz + regex = Mail-SpamAssassin-(\d+\.\d+\.\d+)\.tar\.bz2 } %prep %setup -q -n Mail-SpamAssassin-%{V_sdir} - %patch -p0 %build # configure package @@ -99,11 +93,9 @@ -A PERL_BIN="%{l_prefix}/bin/perl" # build package - %{l_make} %{l_mflags} + %{l_make} %{l_mflags -O} %install - rm -rf $RPM_BUILD_ROOT - # install package %{l_make} %{l_mflags} install @@ -151,7 +143,6 @@ %files -f files %clean - rm -rf $RPM_BUILD_ROOT %post # after upgrade, restart service