From 8e658ca2777e1e4d682c39d16a3b9b303762f744 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Oct 24 2017 18:06:03 +0000 Subject: Patch for util-linux rfkill changes in f28 --- diff --git a/blueberry.spec b/blueberry.spec index 9a4ca17..f98bcfb 100644 --- a/blueberry.spec +++ b/blueberry.spec @@ -1,11 +1,14 @@ Name: blueberry Version: 1.1.15 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Bluetooth configuration tool License: GPLv3+ URL: https://github.com/linuxmint/%{name} Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8 +Patch0: util-linux_rfkill.patch +%endif BuildArch: noarch @@ -125,6 +128,9 @@ fi %changelog +* Tue Oct 24 2017 Leigh Scott - 1.1.15-6 +- Patch for util-linux rfkill change in f28 + * Thu Aug 31 2017 Björn Esser - 1.1.15-5 - Preserve mode of files when changing hashbang diff --git a/util-linux_rfkill.patch b/util-linux_rfkill.patch new file mode 100644 index 0000000..15325d1 --- /dev/null +++ b/util-linux_rfkill.patch @@ -0,0 +1,23 @@ +--- a/usr/lib/blueberry/rfkillMagic.py ++++ b/usr/lib/blueberry/rfkillMagic.py +@@ -11,13 +11,13 @@ + RFKILL_EVENT_MONITOR = ["/usr/sbin/rfkill", "event"] + + # index of .split() from rfkill event output where lines are: +-# 1426095957.906704: idx 0 type 1 op 0 soft 0 hard 0 +-# 1426095957.906769: idx 1 type 2 op 0 soft 1 hard 0 +-# 1426096013.465033: idx 1 type 2 op 2 soft 0 hard 0 ++# 2017-10-24 18:50:24,027405+0100: idx 0 type 2 op 0 soft 0 hard 0 ++# 2017-10-24 18:50:24,027492+0100: idx 1 type 1 op 0 soft 0 hard 0 ++# 2017-10-24 18:55:23,996534+0100: idx 0 type 2 op 2 soft 1 hard 0 + +-EVENT_INDEX_DEVICE = 2 +-EVENT_INDEX_SOFT_BLOCK = 8 +-EVENT_INDEX_HARD_BLOCK = 10 ++EVENT_INDEX_DEVICE = 3 ++EVENT_INDEX_SOFT_BLOCK = 9 ++EVENT_INDEX_HARD_BLOCK = 11 + + class Interface: + def __init__(self, output_callback, debug): +