Hello community, here is the log from the commit of package blueberry for openSUSE:Factory checked in at 2018-01-17 21:57:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blueberry (Old) and /work/SRC/openSUSE:Factory/.blueberry.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blueberry" Wed Jan 17 21:57:43 2018 rev:26 rq:566385 version:1.1.20 Changes: -------- --- /work/SRC/openSUSE:Factory/blueberry/blueberry.changes 2017-12-31 01:13:21.406352266 +0100 +++ /work/SRC/openSUSE:Factory/.blueberry.new/blueberry.changes 2018-01-17 21:58:59.369306430 +0100 @@ -1,0 +2,6 @@ +Tue Jan 16 11:50:01 UTC 2018 - [email protected] + +- Add blueberry-fix-rfkill-path.patch: Fix rfkill's path + (boo#1076134). + +------------------------------------------------------------------- New: ---- blueberry-fix-rfkill-path.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blueberry.spec ++++++ --- /var/tmp/diff_new_pack.T9Mr55/_old 2018-01-17 21:59:00.181268371 +0100 +++ /var/tmp/diff_new_pack.T9Mr55/_new 2018-01-17 21:59:00.185268184 +0100 @@ -1,7 +1,7 @@ # # spec file for package blueberry # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,8 @@ Group: System/GUI/Other Url: https://github.com/linuxmint/blueberry Source: https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +# PATCH-FIX-OPENSUSE blueberry-fix-rfkill-path.patch boo#1076134 [email protected] -- Fix rfkill's path. +Patch0: blueberry-fix-rfkill-path.patch BuildRequires: bluez-tools BuildRequires: fdupes BuildRequires: gobject-introspection-devel @@ -34,16 +36,17 @@ Requires: gnome-bluetooth >= 3.14 Requires: python3-gobject Requires: python3-setproctitle -Requires: rfkill Requires: wmctrl Recommends: %{name}-lang BuildArch: noarch %glib2_gsettings_schema_requires %if 0%{?suse_version} > 1320 Requires: python3-dbus-python +Requires: util-linux %else BuildRequires: update-desktop-files Requires: dbus-1-python3 +Requires: rfkill %endif %if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200 Requires: python3-gobject-Gdk @@ -56,6 +59,7 @@ %prep %setup -q +%patch0 -p1 # Replace the icon with an existing one. sed -i 's/^\(Icon=\).*$/\1%{name}/' .%{_datadir}/applications/%{name}.desktop ++++++ blueberry-fix-rfkill-path.patch ++++++ --- a/usr/lib/blueberry/rfkillMagic.py +++ b/usr/lib/blueberry/rfkillMagic.py @@ -2,14 +2,20 @@ import thread import subprocess import os +import os.path import re from gi.repository import GObject -RFKILL_CHK = ["/usr/sbin/rfkill", "list", "bluetooth"] -RFKILL_BLOCK = ["/usr/sbin/rfkill", "block", "bluetooth"] -RFKILL_UNBLOCK = ["/usr/sbin/rfkill", "unblock", "bluetooth"] +if os.path.isfile("/usr/bin/rfkill"): + RFKILL_BINARY = "/usr/bin/rfkill" +else: + RFKILL_BINARY = "/usr/sbin/rfkill" -RFKILL_EVENT_MONITOR = ["/usr/lib/blueberry/safechild", "/usr/sbin/rfkill", "event"] +RFKILL_CHK = (RFKILL_BINARY, "list", "bluetooth") +RFKILL_BLOCK = (RFKILL_BINARY, "block", "bluetooth") +RFKILL_UNBLOCK = (RFKILL_BINARY, "unblock", "bluetooth") + +RFKILL_EVENT_MONITOR = ("/usr/lib/blueberry/safechild", RFKILL_BINARY, "event") class Interface: def __init__(self, output_callback, debug):
