up to 2.3

diff --git a/ayatana-indicator.patch b/ayatana-indicator.patch
deleted file mode 100644 (file)
index 52501b3..0000000
--- a/ayatana-indicator.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --color -ur blueman-2.2.3.orig/blueman/main/indicators/AppIndicator.py blueman-2.2.3/blueman/main/indicators/AppIndicator.py
---- blueman-2.2.3.orig/blueman/main/indicators/AppIndicator.py 2021-10-27 23:53:20.000000000 +0200
-+++ blueman-2.2.3/blueman/main/indicators/AppIndicator.py      2021-11-24 17:27:22.156528203 +0100
-@@ -2,8 +2,12 @@
- 
- import gi
- 
--gi.require_version('AppIndicator3', '0.1')
--from gi.repository import AppIndicator3
-+try:
-+    gi.require_version('AyatanaAppIndicator3', '0.1')
-+    from gi.repository import AyatanaAppIndicator3 as AppIndicator3
-+except ValueError:
-+    gi.require_version('AppIndicator3', '0.1')
-+    from gi.repository import AppIndicator3
- from blueman.main.indicators.GtkStatusIcon import build_menu
- 
- if TYPE_CHECKING:
-diff --color -ur blueman-2.2.3.orig/blueman/plugins/applet/AppIndicator.py blueman-2.2.3/blueman/plugins/applet/AppIndicator.py
---- blueman-2.2.3.orig/blueman/plugins/applet/AppIndicator.py  2021-10-27 23:53:20.000000000 +0200
-+++ blueman-2.2.3/blueman/plugins/applet/AppIndicator.py       2021-11-24 17:26:51.113366220 +0100
-@@ -8,9 +8,12 @@
- from blueman.plugins.applet.StatusIcon import StatusIconImplementationProvider
- 
- try:
--    require_version('AppIndicator3', '0.1')
-+    require_version('AyatanaAppIndicator3', '0.1')
- except ValueError:
--    raise ImportError("AppIndicator3 not found")
-+    try:
-+        require_version('AppIndicator3', '0.1')
-+    except ValueError:
-+        raise ImportError("AppIndicator3 not found")
- 
- 
- class AppIndicator(AppletPlugin, StatusIconImplementationProvider):

diff --git a/blueman.spec b/blueman.spec
index 10195235e5a6dbbe1825c04bbd9a29b2b47fe7e4..252ba8be694e37875fb757585469a8b167f1be72 100644 (file)
--- a/blueman.spec
+++ b/blueman.spec
@@ -8,13 +8,12 @@
 Summary:       Blueman - Bluetooth management utility for GNOME
 Summary(pl.UTF-8):     Blueman - narzędzie do zarządzania łącznością Bluetooth dla GNOME
 Name:          blueman
-Version:       2.2.5
+Version:       2.3
 Release:       1
 License:       GPL v3+
 Group:         X11/Applications
 Source0:       https://github.com/blueman-project/blueman/releases/download/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 59a73a5f8e75777d51eb23820187a016
-Patch0:                ayatana-indicator.patch
+# Source0-md5: b15931ee020986c23312299f7aa49cd3
 URL:           https://github.com/blueman-project/blueman
 BuildRequires: bluez-libs-devel >= 5.48
 %{?with_mate:BuildRequires:    caja-python-devel}
@@ -47,7 +46,6 @@ Requires:     python3-pygobject3 >= 3.27.2
 Requires:      systemd-units >= 1:250.1
 Suggests:      NetworkManager-libs
 Suggests:      iproute2
-Suggests:      libayatana-appindicator-gtk3
 Suggests:      pulseaudio-bluetooth
 Suggests:      pulseaudio-hal
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -145,7 +143,6 @@ Wtyczka Bluemana dla Thunara.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__aclocal}