From 1dd6f7f4919c8f0a15efc279ff03c4885865146d Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Tue, 21 Aug 2012 14:56:11 +0100 Subject: [PATCH] Update to 3.5.6 --- .gitignore | 1 + ...d-case-in-the-notification-action-cb.patch | 35 ------------------- gnome-settings-daemon.spec | 11 +++--- sources | 2 +- 4 files changed, 7 insertions(+), 42 deletions(-) delete mode 100644 0001-Remove-an-unused-case-in-the-notification-action-cb.patch diff --git a/.gitignore b/.gitignore index a8c4723..a713057 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ gnome-settings-daemon-2.31.6.tar.bz2 /gnome-settings-daemon-3.5.3.tar.xz /gnome-settings-daemon-3.5.4.tar.xz /gnome-settings-daemon-3.5.5.tar.xz +/gnome-settings-daemon-3.5.6.tar.xz diff --git a/0001-Remove-an-unused-case-in-the-notification-action-cb.patch b/0001-Remove-an-unused-case-in-the-notification-action-cb.patch deleted file mode 100644 index af2af17..0000000 --- a/0001-Remove-an-unused-case-in-the-notification-action-cb.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 350682f014b9559c5d3f4308dc8646def5aefae5 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Thu, 19 Jul 2012 17:48:15 -0400 -Subject: [PATCH] Remove an unused case in the notification action cb - -The 'update-all-packages' action is no longer hooked up to -any notification anymore, and the code for dealing with it -was using pk_task_update_system_async, which has been removed -from the PackageKit libraries. ---- - plugins/updates/gsd-updates-manager.c | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/plugins/updates/gsd-updates-manager.c b/plugins/updates/gsd-updates-manager.c -index fd3bd00..84003b5 100644 ---- a/plugins/updates/gsd-updates-manager.c -+++ b/plugins/updates/gsd-updates-manager.c -@@ -242,14 +242,6 @@ libnotify_action_cb (NotifyNotification *notification, - } - goto out; - } -- if (g_strcmp0 (action, "update-all-packages") == 0) { -- pk_task_update_system_async (manager->priv->task, -- manager->priv->cancellable, -- NULL, NULL, -- (GAsyncReadyCallback) update_packages_finished_cb, -- manager); -- goto out; -- } - if (g_strcmp0 (action, "clear-offline-updates") == 0) { - clear_offline_updates_message (); - goto out; --- -1.7.11.2 - diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 0c5b8d5..701b22f 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -1,6 +1,6 @@ Name: gnome-settings-daemon -Version: 3.5.5 -Release: 4%{?dist} +Version: 3.5.6 +Release: 1%{?dist} Summary: The daemon sharing settings from GNOME to GTK+/KDE applications Group: System Environment/Daemons @@ -11,9 +11,6 @@ Source: http://download.gnome.org/sources/%{name}/3.5/%{name}-%{version} # disable wacom for ppc/ppc64 (used on RHEL) Patch0: %{name}-3.5.4-ppc-no-wacom.patch -# upstream fix -Patch1: 0001-Remove-an-unused-case-in-the-notification-action-cb.patch - Requires: control-center-filesystem BuildRequires: dbus-glib-devel @@ -68,7 +65,6 @@ developing applications that use %{name}. %if 0%{?rhel} %patch0 -p1 -b .ppc-no-wacom %endif -%patch1 -p1 autoreconf -i -f @@ -235,6 +231,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_libexecdir}/gsd-test-xsettings %changelog +* Tue Aug 21 2012 Richard Hughes - 3.5.6-1 +- Update to 3.5.6 + * Fri Jul 27 2012 Fedora Release Engineering - 3.5.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 44e0e42..f48cf31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -82f9cdd6052c4d8c82987b6c2c89b96a gnome-settings-daemon-3.5.5.tar.xz +fe30ffde000ee74320c1e1a2e48af514 gnome-settings-daemon-3.5.6.tar.xz