[packages/upower] - rel 3; fix breakage by http://cgit.freedesktop.org/systemd/systemd/commit/?id=5ae18ddc0d86673520c0

arekm arekm at pld-linux.org
Wed Mar 20 17:01:05 CET 2013


commit ac33aa7ddc8bc9f84adc27cdc4e6b88a911a73fb
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Mar 20 17:01:03 2013 +0100

    - rel 3; fix breakage by http://cgit.freedesktop.org/systemd/systemd/commit/?id=5ae18ddc0d86673520c0dd6b59ccac8afc8aa605 (this time correct patch)

 upower-fixes.patch | 12 ++++++++++++
 upower.spec        |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/upower.spec b/upower.spec
index 6ed50cf..9d090ac 100644
--- a/upower.spec
+++ b/upower.spec
@@ -2,11 +2,12 @@ Summary:	Power management service
 Summary(pl.UTF-8):	Usługa zarządzania energią
 Name:		upower
 Version:	0.9.20
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		Libraries
 Source0:	http://upower.freedesktop.org/releases/%{name}-%{version}.tar.xz
 # Source0-md5:	f175984d142dc8d2353a7da609836b69
+Patch0:		%{name}-fixes.patch
 URL:		http://upower.freedesktop.org/
 BuildRequires:	autoconf >= 2.65
 BuildRequires:	automake >= 1:1.11
@@ -101,6 +102,7 @@ Dokumentacja API UPower.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__gtkdocize}
diff --git a/upower-fixes.patch b/upower-fixes.patch
new file mode 100644
index 0000000..b908bb5
--- /dev/null
+++ b/upower-fixes.patch
@@ -0,0 +1,12 @@
+diff -urN upower-0.9.20.org/src/linux/up-device-unifying.c upower-0.9.20/src/linux/up-device-unifying.c
+--- upower-0.9.20.org/src/linux/up-device-unifying.c	2013-01-10 13:08:46.000000000 +0100
++++ upower-0.9.20/src/linux/up-device-unifying.c	2013-03-20 16:55:41.757576712 +0100
+@@ -165,7 +165,7 @@
+ 	hidraw_list = g_udev_client_query_by_subsystem (client, "hidraw");
+ 	for (l = hidraw_list; l != NULL; l = l->next) {
+ 		if (g_strcmp0 (g_udev_device_get_sysfs_path (parent),
+-			       g_udev_device_get_sysfs_attr (l->data, "device")) == 0) {
++			       g_udev_device_get_sysfs_path(g_udev_device_get_parent(l->data))) == 0) {
+ 			receiver = g_object_ref (l->data);
+ 			break;
+ 		}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/upower.git/commitdiff/ac33aa7ddc8bc9f84adc27cdc4e6b88a911a73fb



More information about the pld-cvs-commit mailing list