- rel 5; on fresh install --channelfile won't be used

diff --git a/sa-update.sh b/sa-update.sh
index 14f73786bc23e65e8533ddf262c9ced8cdc7fccc..b221c0461a79dfe53d4c5ec91d216276256c0db4 100644 (file)
--- a/sa-update.sh
+++ b/sa-update.sh
@@ -30,7 +30,8 @@ for file in /etc/mail/spamassassin/channel.d/*.conf; do
     sa-update --import "$file"
 done
 
-[ -f /etc/mail/spamassassin/channels ] && OPT="$OPT --channelfile /etc/mail/spamassassin/channels"
+# Using --channelfile breaks channel.d support :-/ Need better way but stays for now for backward compat
+grep -q "^[a-zA-Z0-9]" /etc/mail/spamassassin/channels && OPT="$OPT --channelfile /etc/mail/spamassassin/channels"
 
 # Run sa-update on each channel, restart spam daemon if success
 for channel in $CHANNELLIST; do

diff --git a/spamassassin.spec b/spamassassin.spec
index 43c6de12bb60e23e33bf02fe4dbb642010798e00..0fcc89ad815499854de25a302ab17f9dca9f2381 100644 (file)
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -13,7 +13,7 @@ Summary:      A spam filter for email which can be invoked from mail delivery agents
 Summary(pl.UTF-8):     Filtr antyspamowy, przeznaczony dla programów dostarczających pocztę (MDA)
 Name:          spamassassin
 Version:       3.4.0
-Release:       4
+Release:       5
 License:       Apache v2.0
 Group:         Applications/Mail
 Source0:       http://ftp.ps.pl/pub/apache//spamassassin/source/%{pdir}-%{pnam}-%{version}.tar.bz2