From 38ecf19e26be907e7205e22bd868723a48f9c9e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Audrius=20Ka=C5=BEukauskas?= <audrius@neutrino.lt>
Date: Wed, 12 May 2010 17:46:01 +0200
Subject: [PATCH] system/spambayes: Updated for version 1.0.4

---
 system/spambayes/slack-desc           |  2 +-
 system/spambayes/spambayes.SlackBuild | 23 +++++++++++++----------
 system/spambayes/spambayes.info       |  8 ++++----
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/system/spambayes/slack-desc b/system/spambayes/slack-desc
index 4bcd92a717..7d1061511c 100644
--- a/system/spambayes/slack-desc
+++ b/system/spambayes/slack-desc
@@ -5,7 +5,7 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-      |-----handy-ruler------------------------------------------------------|
+         |-----handy-ruler------------------------------------------------------|
 spambayes: spambayes (Python-based spam filter using statistical analysis)
 spambayes:
 spambayes: SpamBayes uses a different set of algorithm to most statistical spam
diff --git a/system/spambayes/spambayes.SlackBuild b/system/spambayes/spambayes.SlackBuild
index 687f6b9230..9e4d79be6d 100644
--- a/system/spambayes/spambayes.SlackBuild
+++ b/system/spambayes/spambayes.SlackBuild
@@ -1,36 +1,39 @@
 #!/bin/sh
 
 # Slackware build script for spambayes
-
-# Copyright (c) 2007 Audrius Kažukauskas <neobug@tornado.ktu.lt>
-
-set -e
+# Written by Audrius Kažukauskas <audrius@neutrino.lt>
 
 PRGNAM=spambayes
-VERSION=1.0.4
+VERSION=${VERSION:-1.0.4}
 ARCH=noarch
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
-CWD=`pwd`
+
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+set -eu
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xzvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
-
 chown -R root:root .
 chmod -R u+rw,go+r-w,a-s .
 
+# Eliminate deprecation warning for sets module with Python 2.6
+sed -i 's/from sets import Set/Set = set/' \
+  spambayes/{classifier.py,TestDriver.py,tokenizer.py,ProxyUI.py}
+
 python setup.py install --root=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  CHANGELOG.txt LICENSE.txt NEWTRICKS.txt PKG-INFO POP3PROXY.txt \
+  CHANGELOG.txt LICENSE.txt NEWTRICKS.txt POP3PROXY.txt \
   README-DEVEL.txt README.txt TESTING.txt WHAT_IS_NEW.txt \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a contrib $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/spambayes/spambayes.info b/system/spambayes/spambayes.info
index 3a386de675..6bfc8422b8 100644
--- a/system/spambayes/spambayes.info
+++ b/system/spambayes/spambayes.info
@@ -1,8 +1,8 @@
 PRGNAM="spambayes"
 VERSION="1.0.4"
 HOMEPAGE="http://spambayes.sourceforge.net/"
-DOWNLOAD="http://dl.sourceforge.net/spambayes/spambayes-1.0.4.tar.gz"
+DOWNLOAD="http://downloads.sourceforge.net/spambayes/spambayes-1.0.4.tar.gz"
 MD5SUM="78c33e79888d410711ff3c7dd7e98d79"
-MAINTAINER="Audrius Kažukauskas"
-EMAIL="neobug@tornado.ktu.lt"
-APPROVED="Alan_Hicks"
+MAINTAINER="Audrius Kazukauskas"
+EMAIL="audrius@neutrino.lt"
+APPROVED="dsomero"