[gnome-settings-daemon/f20] Backport a patch to make 'Review' work when using gnome-software
Richard Hughes
rhughes at fedoraproject.org
Mon Nov 25 16:26:29 UTC 2013
commit f286dc3b5a66af47e74e752b9a1dce24491cee78
Author: Richard Hughes <richard at hughsie.com>
Date: Mon Nov 25 16:25:47 2013 +0000
Backport a patch to make 'Review' work when using gnome-software
...ove-the-unconditional-clearing-of-the-off.patch | 30 ++++++++++++++++++++
gnome-settings-daemon.spec | 9 +++++-
2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/0001-updates-Remove-the-unconditional-clearing-of-the-off.patch b/0001-updates-Remove-the-unconditional-clearing-of-the-off.patch
new file mode 100644
index 0000000..225e9f0
--- /dev/null
+++ b/0001-updates-Remove-the-unconditional-clearing-of-the-off.patch
@@ -0,0 +1,30 @@
+From 8c40541f56fadc67f3fae90256d6214a0e83706a Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard at hughsie.com>
+Date: Mon, 25 Nov 2013 14:35:07 +0000
+Subject: [PATCH] updates: Remove the unconditional clearing of the offline
+ updates message
+
+The offline updates status file needs to be around for the failed text and also
+if we're using gnome-software to review the changed updates. We're already
+removing it in the callback even for the non-gnome-software case.
+---
+ plugins/updates/gsd-updates-manager.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/plugins/updates/gsd-updates-manager.c b/plugins/updates/gsd-updates-manager.c
+index 901840e..08b20c6 100644
+--- a/plugins/updates/gsd-updates-manager.c
++++ b/plugins/updates/gsd-updates-manager.c
+@@ -1270,9 +1270,6 @@ check_offline_update_cb (gpointer user_data)
+ message = ngettext ("An important OS update has been installed.",
+ "Important OS updates have been installed.",
+ num_packages);
+-
+- /* no need to keep the file around anymore */
+- clear_offline_updates_message ();
+ } else {
+ /* get error details */
+ manager->priv->offline_update_error = pk_error_new ();
+--
+1.8.4.2
+
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index c92c357..71ddf62 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -6,7 +6,7 @@
Name: gnome-settings-daemon
Version: 3.10.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
Group: System Environment/Daemons
@@ -20,6 +20,9 @@ Patch0: %{name}-3.5.4-ppc-no-wacom.patch
# already upstream, fixes launching gnome-software from the notification
Patch1: 0001-updates-Correctly-start-gnome-software-when-clicking.patch
+# already upstream, fixes review in gnome-software
+Patch2: 0001-updates-Remove-the-unconditional-clearing-of-the-off.patch
+
BuildRequires: gtk3-devel >= 3.7.8
BuildRequires: gnome-desktop3-devel >= %{gnome_desktop_version}
BuildRequires: xorg-x11-proto-devel libXxf86misc-devel
@@ -92,6 +95,7 @@ The %{name}-updates package contains the updates plugin for %{name}
%endif
%patch1 -p1 -b .updates-fix-notification
+%patch2 -p1 -b .updates-fix-review
autoreconf -i -f
@@ -277,6 +281,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.xml
%changelog
+* Mon Nov 25 2013 Richard Hughes <rhughes at redhat.com> - 3.10.2-2
+- Backport a patch to make 'Review' work when using gnome-software
+
* Wed Nov 13 2013 Richard Hughes <rhughes at redhat.com> - 3.10.2-1
- Update to 3.10.2
More information about the scm-commits
mailing list