[mate-applet-softupd/f20] * Mon Apr 28 2014 Patrick Monnerat <pm at datasphere.ch> 0.2.11-1 - New upstream release. - Stop timers

[Patrick Monnerat]

commit dbf1d19ef55e12db9662882c11b69781bee0c86d
Author: Patrick Monnerat <pm at datasphere.ch>
Date:   Mon Apr 28 15:40:07 2014 +0200

    * Mon Apr 28 2014 Patrick Monnerat <pm at datasphere.ch> 0.2.11-1
    - New upstream release.
    - Stop timers on applet destroy.
      https://bugzilla.redhat.com/show_bug.cgi?id=1086989

 .gitignore                                 |    1 +
 mate-applet-softupd-0.2.10-stopclock.patch |   19 +++++++++++++++++++
 mate-applet-softupd.spec                   |   18 ++++++++++++++----
 sources                                    |    2 +-
 4 files changed, 35 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 06d8fa1..909f70b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /mate-applet-softupd-0.2.7.tar.gz
 /mate-applet-softupd-0.2.8.tar.gz
 /mate-applet-softupd-0.2.10.tar.gz
+/mate-applet-softupd-0.2.11.tar.gz
diff --git a/mate-applet-softupd-0.2.10-stopclock.patch b/mate-applet-softupd-0.2.10-stopclock.patch
new file mode 100644
index 0000000..4fc8aaa
--- /dev/null
+++ b/mate-applet-softupd-0.2.10-stopclock.patch
@@ -0,0 +1,19 @@
+diff -Naurp mate-applet-softupd-0.2.10.orig/src/main.c mate-applet-softupd-0.2.10.new/src/main.c
+--- mate-applet-softupd-0.2.10.orig/src/main.c	2013-10-24 20:16:37.000000000 +0200
++++ mate-applet-softupd-0.2.10.new/src/main.c	2014-04-22 17:33:20.154136042 +0200
+@@ -276,8 +276,14 @@ static void applet_back_change (MatePane
+ }
+ 
+ static void applet_destroy(MatePanelApplet *applet_widget, softupd_applet *applet) {
+-	g_main_loop_quit(applet->loop);
+         g_assert(applet);
++
++	/* Remove all timers. */
++
++	while (g_source_remove_by_user_data((gpointer) applet))
++		;
++
++	g_main_loop_quit(applet->loop);
+ 	g_free(applet->pid_arr);
+         g_free(applet);
+         return;
diff --git a/mate-applet-softupd.spec b/mate-applet-softupd.spec
index 7d72643..ec8d5ec 100644
--- a/mate-applet-softupd.spec
+++ b/mate-applet-softupd.spec
@@ -1,11 +1,12 @@
 Name:		mate-applet-softupd
-Version:	0.2.10
+Version:	0.2.11
 Release:	1%{?dist}
 Summary:	MATE Software Update Applet 
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://www.zavedil.com/mate-software-updates-applet/
-Source:		http://www.zavedil.com/wp-content/uploads/2013/10/mate-applet-softupd-%{version}.tar.gz
+Source:		http://www.zavedil.com/wp-content/uploads/2014/04/mate-applet-softupd-%{version}.tar.gz
+Patch1:		mate-applet-softupd-0.2.10-stopclock.patch
 BuildRequires:	mate-panel-devel >= 1.3.0
 BuildRequires:	libnotify-devel >= 0.7.0
 BuildRequires:	PackageKit-glib-devel
@@ -14,7 +15,7 @@ BuildRequires:	PackageKit
 BuildRequires:	yumex
 # BuildRequires:	autoconf
 # BuildRequires:	automake
-Requires:	PackageKit
+Requires:	PackageKit%{?_isa}
 Requires:	yumex
 
 %description
@@ -25,6 +26,7 @@ Software updates notification applet for the MATE desktop environment.
 %prep
 
 %setup -q
+%patch1 -p 1 -b .stopclock
 
 # autoreconf -i -f
 
@@ -82,8 +84,16 @@ fi
 %{_datadir}/dbus-1/services/org.mate.panel.applet.SoftupdApplet.service
 
 
-
 %changelog
+* Mon Apr 28 2014 Patrick Monnerat <pm at datasphere.ch> 0.2.11-1
+- New upstream release.
+- Stop timers on applet destroy.
+  https://bugzilla.redhat.com/show_bug.cgi?id=1086989
+
+* Wed Dec 11 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 0.2.10-2
+- Add %%{?_isa} to PackageKit Requires to avoid arch-independent deps on
+  PackageKit causing multiarch conflicts (#972571).
+
 * Mon Nov 11 2013 Patrick Monnerat <pm at datasphere.ch> 0.2.10-1
 - New upstream release.
 
diff --git a/sources b/sources
index b46fd11..86b8104 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f15f61c05a6701d8f987179f61c7bc0f  mate-applet-softupd-0.2.10.tar.gz
+ec7cd47b25d3d0a12279026b1bbb6761  mate-applet-softupd-0.2.11.tar.gz