rdieter pushed to apper (epel7). "avoid notification spam (kde#318864, #1090595)"

[notifications at fedoraproject.org]

>From eadfdfae54ac7f694b5081355173137623cbf621 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Wed, 5 Nov 2014 10:07:55 -0600
Subject: avoid notification spam (kde#318864,#1090595)


diff --git a/apper-0.8.2-kde318864.patch b/apper-0.8.2-kde318864.patch
new file mode 100644
index 0000000..ca68db5
--- /dev/null
+++ b/apper-0.8.2-kde318864.patch
@@ -0,0 +1,18 @@
+diff -up apper-0.8.2/apperd/TransactionWatcher.cpp.kde318864 apper-0.8.2/apperd/TransactionWatcher.cpp
+--- apper-0.8.2/apperd/TransactionWatcher.cpp.kde318864	2014-04-19 14:25:19.000000000 -0500
++++ apper-0.8.2/apperd/TransactionWatcher.cpp	2014-11-05 08:42:19.418370932 -0600
+@@ -199,7 +199,13 @@ void TransactionWatcher::transactionChan
+     }
+ 
+     // If the
+-    if (!m_transactionJob.contains(tid) && interactive) {
++    Transaction::Role role = transaction->role();
++    if (!m_transactionJob.contains(tid) && interactive &&
++        (role == Transaction::RoleInstallPackages ||
++         role == Transaction::RoleInstallFiles ||
++         role == Transaction::RoleRemovePackages ||
++         role == Transaction::RoleUpdatePackages ||
++         role == Transaction::RoleUpgradeSystem )) {
+         TransactionJob *job = new TransactionJob(transaction, this);
+         connect(transaction, SIGNAL(errorCode(PackageKit::Transaction::Error,QString)),
+                 this, SLOT(errorCode(PackageKit::Transaction::Error,QString)));
diff --git a/apper.spec b/apper.spec
index e048f74..b8db43a 100644
--- a/apper.spec
+++ b/apper.spec
@@ -5,7 +5,7 @@
 
 Name:    apper
 Version: 0.8.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE interface for PackageKit
 
 License: GPLv2+
@@ -20,6 +20,13 @@ URL:     http://kde-apps.org/content/show.php/Apper?content=84745
 # plasma js to enable apper plasma applet
 Source10: 01-fedora-org.packagekit.updater.js
 
+## upstreamable patches 
+# This one is already essentially in apper/master branch
+# https://git.reviewboard.kde.org/r/117990
+# http://bugs.kde.org/show_bug.cgi?id=318864
+# http://bugzilla.redhat.com/1090595
+Patch50: apper-0.8.2-kde318864.patch
+
 ## upstream patches
 # hack around https://bugzilla.redhat.com/948099
 Patch200: 0100-pk-cache-update-debugging.patch
@@ -54,6 +61,7 @@ KDE interface for PackageKit.
 %prep
 %setup -q 
 
+%patch50 -p1 -b .kde318864
 %patch200 -p1 -b .pk_cache_update
 
 %build
@@ -133,6 +141,9 @@ fi
 
 
 %changelog
+* Wed Nov 05 2014 Rex Dieter <rdieter at fedoraproject.org> 0.8.2-2
+- avoid notification spam (kde#318864,#1090595)
+
 * Sat Apr 19 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.8.2-1
 - update to 0.8.2
 - drop upstreamed apper-updater-l10n.patch
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/apper.git/commit/?h=epel7&id=eadfdfae54ac7f694b5081355173137623cbf621