diff --git a/.cvsignore b/.cvsignore index 0eb638f..9ec6c5a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -Mail-SpamAssassin-3.3.0-rc2.tar.bz2 -Mail-SpamAssassin-rules-3.3.0-rc2.r898020.tgz +Mail-SpamAssassin-3.3.0-rc3.tar.bz2 +Mail-SpamAssassin-rules-3.3.0-rc3.r899423.tgz diff --git a/sa-update.cronscript b/sa-update.cronscript index 4bd5c36..14498b6 100644 --- a/sa-update.cronscript +++ b/sa-update.cronscript @@ -34,6 +34,7 @@ for daemon in spamd amavisd; do /sbin/pidof $daemon >& /dev/null [ $? -eq 0 ] && SAUPDATE=yes done +[ -f /var/run/mimedefang.pid ] && SAUPDATE=yes # Skip sa-update if daemon not detected [ -z "$SAUPDATE" ] && exit 0 @@ -79,4 +80,5 @@ done if [ $? -eq 0 ]; then /etc/init.d/spamassassin condrestart > /dev/null [ -f /etc/init.d/amavisd ] && /etc/init.d/amavisd condrestart > /dev/null + [ -f /var/run/mimedefang.pid ] && /etc/init.d/mimedefang reload > /dev/null fi diff --git a/sources b/sources index 0a773ea..feb983e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -a3b39bb31d0c41d7e89450599374c7c9 Mail-SpamAssassin-3.3.0-rc2.tar.bz2 -c3685302eeae5fd75bc05145b4145881 Mail-SpamAssassin-rules-3.3.0-rc2.r898020.tgz +02173a0bc83f945181f5b22759a59598 Mail-SpamAssassin-3.3.0-rc3.tar.bz2 +cbaae6d124b8bb5597903eac8fc58c11 Mail-SpamAssassin-rules-3.3.0-rc3.r899423.tgz diff --git a/spamassassin.spec b/spamassassin.spec index e7c423d..186dd2f 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -51,13 +51,13 @@ Requires: portreserve Summary: Spam filter for email which can be invoked from mail delivery agents Name: spamassassin Version: 3.3.0 -%define prename rc2 -Release: 0.31.%{prename}%{?dist} +%define prename rc3 +Release: 0.32.%{prename}%{?dist} License: ASL 2.0 Group: Applications/Internet URL: http://spamassassin.apache.org/ Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}-%{prename}.tar.bz2 -Source1: Mail-SpamAssassin-rules-3.3.0-rc2.r898020.tgz +Source1: Mail-SpamAssassin-rules-3.3.0-rc3.r899423.tgz Source2: redhat_local.cf Source3: spamassassin-default.rc Source4: spamassassin-spamc.rc @@ -261,6 +261,10 @@ fi exit 0 %changelog +* Thu Jan 14 2010 Warren Togami - 3.3.0-0.32-rc3 +- 3.3.0-rc3 +- if mimedefang is enabled, reload rules after sa-update + * Mon Jan 11 2010 Warren Togami - 3.3.0-0.31-rc2 - 3.3.0-rc2