[kdepim/f17] upstream filtering patch

[Rex Dieter]

commit e22eb674927353fe82df5d4f720e8afceb98ff03
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jul 6 06:46:00 2012 -0500

    upstream filtering patch

 kdepim-4.8.4-filtering.patch |   36 ++++++++++++++++++++++++++++++++++++
 kdepim.spec                  |   10 ++++++++--
 2 files changed, 44 insertions(+), 2 deletions(-)
---
diff --git a/kdepim-4.8.4-filtering.patch b/kdepim-4.8.4-filtering.patch
new file mode 100644
index 0000000..cf2d0de
--- /dev/null
+++ b/kdepim-4.8.4-filtering.patch
@@ -0,0 +1,36 @@
+commit 8846d44b217108351c35f8afd883f72ee88388ec
+Author: Andras Mantia <amantia at kde.org>
+Date:   Fri Jul 6 12:12:34 2012 +0300
+
+    Backport part of the filter fix: this is the actual fix, the rest were optimizations and safety checks, but it is difficult to backport.
+    An unwanted side-effect might be that more data is downloaded than before,
+    based on the type of filters used.
+    
+    FIXED-IN: 4.8.5
+    CCBUG: 287752
+    CCBUG: 292283
+    CCBUG: 288109
+    CCBUG: 286043
+    CCBUG: 295484
+    CCBUG: 302337
+    CCBUG: 295000
+    CCBUG: 295684
+    CCBUG: 293768
+    CCBUG: 275233
+    CCBUG: 293918
+    CCBUG: 284310
+    CCBUG: 286364
+    CCBUG: 283682
+
+diff --git a/mailfilteragent/mailfilteragent.cpp b/mailfilteragent/mailfilteragent.cpp
+index 79b2f9d..5f66e74 100644
+--- a/mailfilteragent/mailfilteragent.cpp
++++ b/mailfilteragent/mailfilteragent.cpp
+@@ -110,7 +110,6 @@ void MailFilterAgent::initialCollectionFetchingDone( KJob *job )
+   Akonadi::CollectionFetchJob *fetchJob = qobject_cast<Akonadi::CollectionFetchJob*>( job );
+ 
+   changeRecorder()->itemFetchScope().setAncestorRetrieval( Akonadi::ItemFetchScope::Parent );
+-  changeRecorder()->itemFetchScope().setCacheOnly( true );
+   if (m_filterManager->requiresFullMailBody()) {
+     changeRecorder()->itemFetchScope().fetchFullPayload();
+   } else {
diff --git a/kdepim.spec b/kdepim.spec
index bea42c1..ed275fa 100644
--- a/kdepim.spec
+++ b/kdepim.spec
@@ -2,7 +2,7 @@ Name:    kdepim
 Summary: KDE PIM (Personal Information Manager) applications
 Epoch:   7
 Version: 4.8.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -21,7 +21,9 @@ Patch0:  kdepim-4.5.85-install-headers.patch
 # fix KMail migration (kde#283563)
 Patch2: kdepim-4.7.2-kmail-migration.patch
 
-# upstream patches
+## upstream patches
+# https://projects.kde.org/projects/kde/kdepim/repository/revisions/8846d44b217108351c35f8afd883f72ee88388ec
+Patch100: kdepim-4.8.4-filtering.patch
 
 Provides: kdepim4 = %{version}-%{release}
 
@@ -94,6 +96,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %patch0 -p1 -b .install-headers
 %patch2 -p1 -b .kmail-migration
+%patch100 -p1 -b .filtering
 
 
 %build
@@ -218,6 +221,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jul 06 2012 Rex Dieter <rdieter at fedoraproject.org> 7:4.8.4-3
+- upstream filtering patch
+
 * Thu Jun 07 2012 Lukáš Tinkl <ltinkl at redhat.com> - 6:4.8.4-2
 - respin