From 82df6a87c301fdc664b90ea8a8467d6acd47ee7a Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mon, 14 Mar 2016 15:32:36 +0100 Subject: [PATCH] Fix getting the critical action --- 0001-daemon-fix-get_critical_action.patch | 31 +++++++++++++++++++++++ upower.spec | 7 ++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0001-daemon-fix-get_critical_action.patch diff --git a/0001-daemon-fix-get_critical_action.patch b/0001-daemon-fix-get_critical_action.patch new file mode 100644 index 0000000..85bc230 --- /dev/null +++ b/0001-daemon-fix-get_critical_action.patch @@ -0,0 +1,31 @@ +From 28cee8e2845b094488c337c4ecfa84ada0b6be60 Mon Sep 17 00:00:00 2001 +From: Martin Pitt +Date: Tue, 23 Feb 2016 09:51:07 +0100 +Subject: [PATCH] daemon: fix get_critical_action() + +Fix copy&paste error from e7e9156f that called the wrong _complete_ function +for up_daemon_get_critical_action(). + +https://bugs.freedesktop.org/show_bug.cgi?id=94262 +--- + src/up-daemon.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/up-daemon.c b/src/up-daemon.c +index be14cbe..e95f904 100644 +--- a/src/up-daemon.c ++++ b/src/up-daemon.c +@@ -435,8 +435,8 @@ up_daemon_get_critical_action (UpExportedDaemon *skeleton, + GDBusMethodInvocation *invocation, + UpDaemon *daemon) + { +- up_exported_daemon_complete_get_display_device (skeleton, invocation, +- up_backend_get_critical_action (daemon->priv->backend)); ++ up_exported_daemon_complete_get_critical_action (skeleton, invocation, ++ up_backend_get_critical_action (daemon->priv->backend)); + return TRUE; + } + +-- +2.5.0 + diff --git a/upower.spec b/upower.spec index dc16f6c..61b5678 100644 --- a/upower.spec +++ b/upower.spec @@ -1,7 +1,7 @@ Summary: Power Management Service Name: upower Version: 0.99.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://upower.freedesktop.org/ @@ -22,6 +22,8 @@ BuildRequires: gtk-doc Requires: udev Requires: gobject-introspection +Patch0: 0001-daemon-fix-get_critical_action.patch + %if 0%{?fedora} # From rhughes-f20-gnome-3-12 copr Obsoletes: compat-upower09 < 0.99 @@ -108,6 +110,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_datadir}/gtk-doc/html/UPower/* %changelog +* Mon Mar 14 2016 Bastien Nocera 0.99.4-2 +- Fix getting the critical action + * Tue Feb 16 2016 Richard Hughes - 0.99.4-1 - New upstream release - Add support for Logitech G700s/G700 Gaming Mouse