File r890872.diff of Package kdepim4
Subject: kmail: remove deprecated spamassassin flag
From: wstephenson@suse.de
Bug: kde#140032
Patch-upstream: 890872
--- kmail/kmail.antispamrc (revision 890871)
+++ kmail/kmail.antispamrc (revision 890872)
@@ -11,8 +11,8 @@ URL=http://spamassassin.org
PipeFilterName=SpamAssassin Check
PipeCmdDetect=spamassassin -L
PipeCmdNoSpam=spamassassin -d
-ExecCmdSpam=sa-learn -L --spam --no-rebuild --single
-ExecCmdHam=sa-learn -L --ham --no-rebuild --single
+ExecCmdSpam=sa-learn -L --spam --no-sync --single
+ExecCmdHam=sa-learn -L --ham --no-sync --single
DetectionHeader=X-Spam-Flag
DetectionPattern=yes
DetectionPattern2=
@@ -136,8 +136,8 @@ URL=http://spamassassin.org
PipeFilterName=SpamAssassin Service Check
PipeCmdDetect=spamc
PipeCmdNoSpam=spamassassin -d
-ExecCmdSpam=sa-learn -L --spam --no-rebuild --single
-ExecCmdHam=sa-learn -L --ham --no-rebuild --single
+ExecCmdSpam=sa-learn -L --spam --no-sync --single
+ExecCmdHam=sa-learn -L --ham --no-sync --single
DetectionHeader=X-Spam-Flag
DetectionPattern=yes
DetectionPattern2=
--- kmail/antispamwizard.h (revision 890871)
+++ kmail/antispamwizard.h (revision 890872)
@@ -88,8 +88,8 @@ namespace KMail {
URL=http://spamassassin.org
PipeFilterName=SpamAssassin Check
PipeCmdDetect=spamassassin -L
- ExecCmdSpam=sa-learn --spam --no-rebuild --single
- ExecCmdHam=sa-learn --ham --no-rebuild --single
+ ExecCmdSpam=sa-learn --spam --no-sync --single
+ ExecCmdHam=sa-learn --ham --no-sync --single
PipeCmdNoSpam=spamassassin -d
DetectionHeader=X-Spam-Flag
DetectionPattern=yes
--- kmail/antispamwizard.cpp (revision 890871)
+++ kmail/antispamwizard.cpp (revision 890872)
@@ -782,8 +782,8 @@ AntiSpamWizard::SpamToolConfig AntiSpamW
"SpamAssassin", "spamassassin -V",
"http://spamassassin.org", "SpamAssassin Check",
"spamassassin -L",
- "sa-learn -L --spam --no-rebuild --single",
- "sa-learn -L --ham --no-rebuild --single",
+ "sa-learn -L --spam --no-sync --single",
+ "sa-learn -L --ham --no-sync --single",
"spamassassin -d",
"X-Spam-Flag", "yes", "", "",
false, false, true, false, AntiSpam );
Index: kmail/kmail.antispamrc
===================================================================
Index: kmail/antispamwizard.h
===================================================================
Index: kmail/antispamwizard.cpp
===================================================================