1.1 --- a/spamassassin/spamassassin.spec Wed Sep 21 13:51:49 2011 +0200 1.2 +++ b/spamassassin/spamassassin.spec Wed Sep 21 13:55:11 2011 +0200 1.3 @@ -1,6 +1,6 @@ 1.4 ## 1.5 ## spamassassin.spec -- OpenPKG RPM Package Specification 1.6 -## Copyright (c) 2000-2009 OpenPKG Foundation e.V. <http://openpkg.net/> 1.7 +## Copyright (c) 2000-2011 OpenPKG Foundation e.V. <http://openpkg.net/> 1.8 ## 1.9 ## Permission to use, copy, modify, and distribute this software for 1.10 ## any purpose with or without fee is hereby granted, provided that 1.11 @@ -22,9 +22,9 @@ 1.12 ## 1.13 1.14 # package version 1.15 -%define V_real 3.2.5 1.16 -%define V_here 3.2.5 1.17 -%define V_sdir 3.2.5 1.18 +%define V_real 3.3.1 1.19 +%define V_here 3.3.1 1.20 +%define V_sdir 3.3.1 1.21 1.22 # package information 1.23 Name: spamassassin 1.24 @@ -37,7 +37,7 @@ 1.25 Group: Mail 1.26 License: ASF 1.27 Version: %{V_here} 1.28 -Release: 20090420 1.29 +Release: 20110914 1.30 1.31 # package options 1.32 %option with_fsl yes 1.33 @@ -47,14 +47,15 @@ 1.34 Source1: rc.spamassassin 1.35 Source2: local.cf 1.36 Source3: fsl.spamassassin 1.37 +Patch0: spamassassin.patch 1.38 1.39 # build information 1.40 Prefix: %{l_prefix} 1.41 BuildRoot: %{l_buildroot} 1.42 BuildPreReq: OpenPKG, openpkg >= 20060823, perl, perl-openpkg >= 5.8.4, make 1.43 -PreReq: OpenPKG, openpkg >= 20060823, perl 1.44 -BuildPreReq: perl-db, perl-crypto, perl-xml, perl-dns 1.45 -PreReq: perl-db, perl-crypto, perl-xml, perl-dns 1.46 +PreReq: OpenPKG, openpkg >= 20060823, perl, gnupg 1.47 +BuildPreReq: perl-db, perl-crypto, perl-xml, perl-dns, perl-locale, perl-www 1.48 +PreReq: perl-db, perl-crypto, perl-xml, perl-dns, perl-locale, perl-www 1.49 %if "%{with_fsl}" == "yes" 1.50 BuildPreReq: fsl 1.51 PreReq: fsl 1.52 @@ -80,6 +81,7 @@ 1.53 1.54 %prep 1.55 %setup -q -n Mail-SpamAssassin-%{V_sdir} 1.56 + %patch -p0 1.57 1.58 %build 1.59 # configure package 1.60 @@ -114,7 +116,6 @@ 1.61 1.62 # create directories for PID file and virtual users 1.63 %{l_shtool} mkdir -f -p -m 755 \ 1.64 - $RPM_BUILD_ROOT%{l_prefix}/var/spamassassin \ 1.65 $RPM_BUILD_ROOT%{l_prefix}/var/spamassassin/spool 1.66 1.67 # strip installation