[arch-commits] CVS update of extra/network/spamassassin (PKGBUILD spamassassin.install)

[Dale Blount]

    Date: Thursday, May 3, 2007 @ 15:59:48
  Author: dale
    Path: /home/cvs-extra/extra/network/spamassassin

Modified: PKGBUILD (1.37 -> 1.38) spamassassin.install (1.3 -> 1.4)

upgpkg: spamassassin 3.2.0-1


----------------------+
 PKGBUILD             |   22 ++++++++++++----------
 spamassassin.install |    6 +++---
 2 files changed, 15 insertions(+), 13 deletions(-)


Index: extra/network/spamassassin/PKGBUILD
diff -u extra/network/spamassassin/PKGBUILD:1.37 extra/network/spamassassin/PKGBUILD:1.38
--- extra/network/spamassassin/PKGBUILD:1.37	Tue Feb 20 11:33:26 2007
+++ extra/network/spamassassin/PKGBUILD	Thu May  3 15:59:48 2007
@@ -1,27 +1,30 @@
-# $Id: PKGBUILD,v 1.37 2007/02/20 16:33:26 dale Exp $
+# $Id: PKGBUILD,v 1.38 2007/05/03 19:59:48 dale Exp $
 # Maintainer: Dale Blount <dale at archlinux.org>
 # Contributor: Manolis Tzanidakis
 
 pkgname=spamassassin
-pkgver=3.1.8
+pkgver=3.2.0
 pkgrel=1
 pkgdesc="A mail filter to identify spam."
 arch=(i686 x86_64)
 url="http://spamassassin.apache.org"
 depends=('perl' 'perl-net-dns' 'perl-uri' 'perl-html-parser' \
 		'perl-digest-sha1' 'perl-io-socket-ssl' 'openssl' \
-		'perl-libwww' 'perl-io-zlib' 'perl-mail-spf-query' \
-		'perl-archive-tar')
+		'perl-libwww' 'perl-io-zlib' 'perl-mail-spf' \
+		'perl-archive-tar' 'zlib')
 makedepends=('razor' 'perl-dbi') 
 backup=(etc/conf.d/spamd etc/mail/spamassassin/local.cf \
 	etc/mail/spamassassin/init.pre \
 	etc/mail/spamassassin/v310.pre \
-	etc/mail/spamassassin/v312.pre)
+	etc/mail/spamassassin/v312.pre \
+	etc/mail/spamassassin/v320.pre)
 install=$pkgname.install
 source=(http://www.devlib.org/apache/$pkgname/source/Mail-SpamAssassin-$pkgver.tar.gz \
-		spamd.conf.d spamd sa-learn.patch)
-md5sums=('20a3a6b651a89dcc70634715ca833996' 'af501c6b0bb937a2775b747cc4b6d150'\
-         '6f1636c8a547345ea7fddcbbf106abf7' 'fb5d2b50c8f5b53b326110783422e4bd')
+		spamd.conf.d spamd spamassassin.install)
+md5sums=('aed988bb6cf463afc868a64d4cd771a3' 'af501c6b0bb937a2775b747cc4b6d150'\
+         '6f1636c8a547345ea7fddcbbf106abf7' '3f3d131d6992ecfbfb78f067cd4271b2')
+
+
 build() {
   cd $startdir/src/Mail-SpamAssassin-$pkgver
 
@@ -31,8 +34,6 @@
   # compatible with newer versions of perl.
   curperlver=`pacman -Q perl | cut -d ' ' -f 2 | cut -d '-' -f 1`
   /bin/sed -i "s:$curperlver:current:g" Makefile
-	# patch to fix sa-learn in 3.1.8
-	patch -p0 < $startdir/src/sa-learn.patch || return 1
   /usr/bin/make || return 1
   /usr/bin/make DESTDIR=$startdir/pkg install
   /bin/rm -rf $startdir/pkg/usr/lib/perl5/current/
@@ -40,3 +41,4 @@
   /bin/install -D -m644 $startdir/spamd.conf.d $startdir/pkg/etc/conf.d/spamd
   /bin/install -D -m755 $startdir/spamd $startdir/pkg/etc/rc.d/spamd
 }
+
Index: extra/network/spamassassin/spamassassin.install
diff -u extra/network/spamassassin/spamassassin.install:1.3 extra/network/spamassassin/spamassassin.install:1.4
--- extra/network/spamassassin/spamassassin.install:1.3	Tue Sep 27 10:37:21 2005
+++ extra/network/spamassassin/spamassassin.install	Thu May  3 15:59:48 2007
@@ -1,13 +1,13 @@
 # arg 1:  the new package version
 post_install() {
-	echo "=> If you are upgrading from SpamAssassin 2.x or 3.0.x, please"
-	echo "=> see http://spamassassin.apache.org/full/3.0.x/dist/UPGRADE"
+	echo "=> If you are upgrading from SpamAssassin 2.x, 3.0.x or 3.1.x, please see"
+	echo "=> http://svn.apache.org/repos/asf/spamassassin/tags/spamassassin_current_release_3.2.x/UPGRADE"
 }
 
 # arg 1:  the new package version
 # arg 2:  the old package version
 post_upgrade() {
-	/bin/true
+	post_install
 }
 
 # arg 1:  the old package version