rpms/gnome-settings-daemon
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to 3.9.92

Browse Source
This commit is contained in:
Kalev Lember 2013-09-18 10:43:34 +02:00
parent d8f9dfeda5
commit 3092e307c4
3 changed files with 6 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
0001-updates-Do-not-clear-the-offline-update-if-rebooting.patch
View File

@ -1,29 +0,0 @@
From 9dee649674682f58d9e7d532e3f2ef27078675d7 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@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

11
gnome-settings-daemon.spec
View File

@ -5,8 +5,8 @@
%global geocode_glib_version 0.99.3
Name: gnome-settings-daemon
Version: 3.9.91.1
Release: 2%{?dist}
Version: 3.9.92
Release: 1%{?dist}
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
Group: System Environment/Daemons
@ -17,9 +17,6 @@ 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}
@ -92,7 +89,6 @@ 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
@ -278,6 +274,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
* Wed Sep 18 2013 Kalev Lember <kalevlember@gmail.com> - 3.9.92-1
- Update to 3.9.92
* Tue Sep 17 2013 Richard Hughes <rhughes@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.

2
sources
View File

@ -1 +1 @@
050f79f7709c046f14bf34dbb9d0875d gnome-settings-daemon-3.9.91.1.tar.xz
62bf3a0175ebb0acef641c351be52a2f gnome-settings-daemon-3.9.92.tar.xz