diff --git a/.gitignore b/.gitignore index a1da61f..d447c9b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/upower-0.99.2.tar.xz +SOURCES/upower-0.99.4.tar.xz diff --git a/.upower.metadata b/.upower.metadata index 7977ff9..f8c5f62 100644 --- a/.upower.metadata +++ b/.upower.metadata @@ -1 +1 @@ -c8813e21b4ffca5a7cee4c6af5763239158aaf5e SOURCES/upower-0.99.2.tar.xz +70beb18c218e758586fb5d98d79b5121cc4a47b1 SOURCES/upower-0.99.4.tar.xz diff --git a/SOURCES/0001-daemon-fix-get_critical_action.patch b/SOURCES/0001-daemon-fix-get_critical_action.patch new file mode 100644 index 0000000..85bc230 --- /dev/null +++ b/SOURCES/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/SOURCES/0005-lib-Fix-crash-on-uninitialized-variant.patch b/SOURCES/0005-lib-Fix-crash-on-uninitialized-variant.patch deleted file mode 100644 index acdc792..0000000 --- a/SOURCES/0005-lib-Fix-crash-on-uninitialized-variant.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 2510148b16a71504dff3880c8af416fd85a2885d Mon Sep 17 00:00:00 2001 -From: Vlad Orlov -Date: Fri, 13 Mar 2015 13:17:31 +0100 -Subject: lib: Fix crash on uninitialized variant - -Initialize the GVariant* pointers, so that they aren't uninitialized when -jumping to "out:" and unref'ing them. - -https://bugs.freedesktop.org/show_bug.cgi?id=89476 -https://bugs.debian.org/774546 -https://bugs.launchpad.net/ubuntu-mate/+bug/1428337 - -diff --git a/libupower-glib/up-device.c b/libupower-glib/up-device.c -index 9f6e0e1..f053f3d 100644 ---- a/libupower-glib/up-device.c -+++ b/libupower-glib/up-device.c -@@ -422,7 +422,7 @@ GPtrArray * - up_device_get_history_sync (UpDevice *device, const gchar *type, guint timespec, guint resolution, GCancellable *cancellable, GError **error) - { - GError *error_local = NULL; -- GVariant *gva; -+ GVariant *gva = NULL; - guint i; - GPtrArray *array = NULL; - gboolean ret; -@@ -502,7 +502,7 @@ GPtrArray * - up_device_get_statistics_sync (UpDevice *device, const gchar *type, GCancellable *cancellable, GError **error) - { - GError *error_local = NULL; -- GVariant *gva; -+ GVariant *gva = NULL; - guint i; - GPtrArray *array = NULL; - gboolean ret; --- -cgit v0.10.2 - diff --git a/SPECS/upower.spec b/SPECS/upower.spec index 32380c9..0f4d063 100644 --- a/SPECS/upower.spec +++ b/SPECS/upower.spec @@ -2,16 +2,13 @@ Summary: Power Management Service Name: upower -Version: 0.99.2 -Release: 1%{?dist} +Version: 0.99.4 +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://upower.freedesktop.org/ Source0: http://upower.freedesktop.org/releases/upower-%{version}.tar.xz -## upstream fixes -Patch5: 0005-lib-Fix-crash-on-uninitialized-variant.patch - BuildRequires: sqlite-devel BuildRequires: libtool BuildRequires: intltool @@ -22,13 +19,18 @@ BuildRequires: libusbx-devel BuildRequires: libimobiledevice-devel %endif BuildRequires: glib2-devel >= 2.6.0 -BuildRequires: dbus-devel >= 1.2 -BuildRequires: dbus-glib-devel >= 0.82 BuildRequires: gobject-introspection-devel 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 +%endif + %description UPower (formerly DeviceKit-power) provides a daemon, API and command line tools for managing power devices attached to the system. @@ -110,6 +112,14 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_datadir}/gtk-doc/html/UPower/* %changelog +* Fri Mar 10 2017 Kalev Lember - 0.99.4-2 +- Rebuilt for libplist 1.2 +- Resolves: #1387051 + +* Wed Oct 19 2016 Kalev Lember - 0.99.4-1 +- New upstream release +- Resolves: #1387051 + * Thu Dec 18 2014 Richard Hughes - 0.99.2-1 - New upstream release - Resolves: #1174421