1.1 --- a/spamassassin/spamassassin.spec Tue Aug 28 19:00:40 2012 +0200
1.2 +++ b/spamassassin/spamassassin.spec Tue Aug 28 19:00:50 2012 +0200
1.3 @@ -22,9 +22,9 @@
1.4 ##
1.5
1.6 # package version
1.7 -%define V_real 3.3.1
1.8 -%define V_here 3.3.1
1.9 -%define V_sdir 3.3.1
1.10 +%define V_real 3.3.2
1.11 +%define V_here 3.3.2
1.12 +%define V_sdir 3.3.2
1.13
1.14 # package information
1.15 Name: spamassassin
1.16 @@ -37,31 +37,26 @@
1.17 Group: Mail
1.18 License: ASF
1.19 Version: %{V_here}
1.20 -Release: 20110914
1.21 +Release: 20120800
1.22
1.23 # package options
1.24 %option with_fsl yes
1.25
1.26 # list of sources
1.27 -Source0: http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-%{V_real}.tar.gz
1.28 +Source0: http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-%{V_real}.tar.bz2
1.29 Source1: rc.spamassassin
1.30 Source2: local.cf
1.31 Source3: fsl.spamassassin
1.32 -Patch0: spamassassin.patch
1.33
1.34 # build information
1.35 -Prefix: %{l_prefix}
1.36 -BuildRoot: %{l_buildroot}
1.37 -BuildPreReq: OpenPKG, openpkg >= 20060823, perl, perl-openpkg >= 5.8.4, make
1.38 -PreReq: OpenPKG, openpkg >= 20060823, perl, gnupg
1.39 +BuildPreReq: OpenPKG, openpkg >= 20100101, perl, perl-openpkg >= 5.8.4, make
1.40 +PreReq: OpenPKG, openpkg >= 20100101, perl, gnupg
1.41 BuildPreReq: perl-db, perl-crypto, perl-xml, perl-dns, perl-locale, perl-www
1.42 PreReq: perl-db, perl-crypto, perl-xml, perl-dns, perl-locale, perl-www
1.43 %if "%{with_fsl}" == "yes"
1.44 BuildPreReq: fsl
1.45 PreReq: fsl
1.46 %endif
1.47 -AutoReq: no
1.48 -AutoReqProv: no
1.49
1.50 %description
1.51 SpamAssassin provides you with a way to reduce if not completely
1.52 @@ -76,12 +71,11 @@
1.53 prog spamassassin = {
1.54 version = %{V_real}
1.55 url = http://www.apache.org/dist/spamassassin/source/
1.56 - regex = Mail-SpamAssassin-(\d+\.\d+\.\d+)\.tar\.gz
1.57 + regex = Mail-SpamAssassin-(\d+\.\d+\.\d+)\.tar\.bz2
1.58 }
1.59
1.60 %prep
1.61 %setup -q -n Mail-SpamAssassin-%{V_sdir}
1.62 - %patch -p0
1.63
1.64 %build
1.65 # configure package
1.66 @@ -99,11 +93,9 @@
1.67 -A PERL_BIN="%{l_prefix}/bin/perl"
1.68
1.69 # build package
1.70 - %{l_make} %{l_mflags}
1.71 + %{l_make} %{l_mflags -O}
1.72
1.73 %install
1.74 - rm -rf $RPM_BUILD_ROOT
1.75 -
1.76 # install package
1.77 %{l_make} %{l_mflags} install
1.78
1.79 @@ -151,7 +143,6 @@
1.80 %files -f files
1.81
1.82 %clean
1.83 - rm -rf $RPM_BUILD_ROOT
1.84
1.85 %post
1.86 # after upgrade, restart service
