From d05086dfa436c1a0296204d54991444c49a7ff6b Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux@googlemail.com>
Date: Nov 14 2017 07:57:54 +0000
Subject: New upstream release


---

diff --git a/blueberry-tray-fix.patch b/blueberry-tray-fix.patch
new file mode 100644
index 0000000..862240d
--- /dev/null
+++ b/blueberry-tray-fix.patch
@@ -0,0 +1,23 @@
+From c54c333d1921d1ff8989c751a8ef7324e02db033 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Mon, 13 Nov 2017 18:13:55 -0500
+Subject: [PATCH] blueberry.py: Don't start blueberry-tray, it gets started on
+ our behalf in the session manager since e3417c06177a.
+
+Starting it here as well currently results in 2 tray icons spawning.
+---
+ usr/lib/blueberry/blueberry.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/usr/lib/blueberry/blueberry.py b/usr/lib/blueberry/blueberry.py
+index 9e9e5cd..c0a55c0 100755
+--- a/usr/lib/blueberry/blueberry.py
++++ b/usr/lib/blueberry/blueberry.py
+@@ -200,7 +200,6 @@ def panel_changed(self, widget, panel):
+     def on_tray_switch_toggled(self, widget, data=None):
+         if widget.get_active():
+             self.settings.set_boolean("tray-enabled", True)
+-            subprocess.Popen(["blueberry-tray"])
+         else:
+             self.settings.set_boolean("tray-enabled", False)
+ 
diff --git a/blueberry.spec b/blueberry.spec
index 063dbd7..5e7e77b 100644
--- a/blueberry.spec
+++ b/blueberry.spec
@@ -1,5 +1,5 @@
 Name:		blueberry
-Version:	1.1.17
+Version:	1.1.18
 Release:	1%{?dist}
 Summary:	Bluetooth configuration tool
 
@@ -9,6 +9,7 @@ Source0:	%{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 %if 0%{?fedora} >= 28 || 0%{?rhel} >= 8
 Patch0:		util-linux_rfkill.patch
 %endif
+Patch1:		%{url}/commit/c54c333d1921d1ff8989c751a8ef7324e02db033.patch#/blueberry-tray-fix.patch
 
 BuildArch:	noarch
 
@@ -128,6 +129,10 @@ fi
 
 
 %changelog
+* Tue Nov 14 2017 Leigh Scott <leigh123linux@googlemail.com> - 1.1.18-1
+- New upstream release
+  Add upstream fix for double icons (rhbz#1478751)
+
 * Mon Nov 06 2017 Björn Esser <besser82@fedoraproject.org> - 1.1.17-1
 - New upstream release (rhbz#1509725)
 
diff --git a/sources b/sources
index fb9e4ff..49ff9aa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (blueberry-1.1.17.tar.gz) = 7570038668117103b845d06f6b83a341bc287e2620a76db8fb0100922138d708c65b5808c77fd90033e391c28b7815af48e615b50541e44a7b668fd97c3da3d6
+SHA512 (blueberry-1.1.18.tar.gz) = 3db12c5624a8417611f093dbd8d206dc12a46216cf721277b66946a1874d04a3d4ae26496ba0eada579554031927807a571098a6cbef035ad8886f2732704a7d