Backport a patch to make 'Review' work when using gnome-software

This commit is contained in:
Richard Hughes 2013-11-25 16:25:47 +00:00
parent 3e826e4968
commit f286dc3b5a
2 changed files with 38 additions and 1 deletions

View File

@ -0,0 +1,30 @@
From 8c40541f56fadc67f3fae90256d6214a0e83706a Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@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

View File

@ -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@redhat.com> - 3.10.2-2
- Backport a patch to make 'Review' work when using gnome-software
* Wed Nov 13 2013 Richard Hughes <rhughes@redhat.com> - 3.10.2-1
- Update to 3.10.2