[gnome-settings-daemon/f20] Fix the offline updates feature

[Richard Hughes]

commit d8f9dfeda5504b9d945b531f2043f28ff71fc815
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Sep 17 16:14:52 2013 +0100

    Fix the offline updates feature

 ...not-clear-the-offline-update-if-rebooting.patch |   29 ++++++++++++++++++++
 gnome-settings-daemon.spec                         |   10 ++++++-
 2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/0001-updates-Do-not-clear-the-offline-update-if-rebooting.patch b/0001-updates-Do-not-clear-the-offline-update-if-rebooting.patch
new file mode 100644
index 0000000..e13b48b
--- /dev/null
+++ b/0001-updates-Do-not-clear-the-offline-update-if-rebooting.patch
@@ -0,0 +1,29 @@
+From 9dee649674682f58d9e7d532e3f2ef27078675d7 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard at hughsie.com>
+Date: Tue, 17 Sep 2013 16:08:15 +0100
+Subject: [PATCH] updates: Do not clear the offline-update if rebooting
+ succeeded
+
+---
+ plugins/updates/gsd-updates-manager.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/updates/gsd-updates-manager.c b/plugins/updates/gsd-updates-manager.c
+index 9c8ab79..3aff29a 100644
+--- a/plugins/updates/gsd-updates-manager.c
++++ b/plugins/updates/gsd-updates-manager.c
+@@ -1324,8 +1324,10 @@ reboot_failed (GObject *source, GAsyncResult *res, gpointer data)
+         GError *error = NULL;
+ 
+         ret = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), res, &error);
+-        if (ret)
++        if (ret) {
+                 g_variant_unref (ret);
++                return;
++        }
+ 
+         if (error) {
+                 g_warning ("Calling org.gnome.SessionManager.Reboot failed: %s\n", error->message);
+-- 
+1.8.3.1
+
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index e4f87e5..f3491b2 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -6,7 +6,7 @@
 
 Name:           gnome-settings-daemon
 Version:        3.9.91.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:          System Environment/Daemons
@@ -17,6 +17,9 @@ Source:         http://download.gnome.org/sources/%{name}/3.9/%{name}-%{version}
 # disable wacom for ppc/ppc64 (used on RHEL)
 Patch0:         %{name}-3.5.4-ppc-no-wacom.patch
 
+# taken from upstream to make offline updates actually work
+Patch1:         0001-updates-Do-not-clear-the-offline-update-if-rebooting.patch
+
 BuildRequires:  dbus-glib-devel
 BuildRequires:  gtk3-devel >= 3.7.8
 BuildRequires:  gnome-desktop3-devel >= %{gnome_desktop_version}
@@ -89,6 +92,7 @@ The %{name}-updates package contains the updates plugin for %{name}
 %if 0%{?rhel}
 %patch0 -p1 -b .ppc-no-wacom
 %endif
+%patch1 -p1 -b .offline-updates-no-clear
 
 autoreconf -i -f
 
@@ -274,6 +278,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.xml
 
 %changelog
+* Tue Sep 17 2013 Richard Hughes <rhughes at redhat.com> - 3.9.91.1-2
+- Grab a patch from upstream so that the offline updates feature can
+  actually work when reboot returns with success.
+
 * Tue Sep 03 2013 Matthias Clasen <mclasen at redhat.com> - 3.9.91.1-1
 - Update to 3.9.91.1