From 5759428a46e94d1c198cb7992a7f06df3bfabb90 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Mon, 14 May 2018 23:16:51 +0900 Subject: [PATCH] - updated to 2.0.5 and made it work --- blueman.spec | 19 +- icon-active.patch | 12 - missing-icons.patch | 555 -------------------------------------------- 3 files changed, 7 insertions(+), 579 deletions(-) delete mode 100644 icon-active.patch delete mode 100644 missing-icons.patch diff --git a/blueman.spec b/blueman.spec index e256469..426d98b 100644 --- a/blueman.spec +++ b/blueman.spec @@ -1,11 +1,11 @@ Summary: Blueman - bluetooth management utility for GNOME Name: blueman -Version: 2.0 -Release: 2 +Version: 2.0.5 +Release: 1 License: GPL Group: X11/Applications Source0: https://github.com/blueman-project/blueman/releases/download/%{version}/%{name}-%{version}.tar.xz -# Source0-md5: d95270145475ce41a33bf7390afe3428 +# Source0-md5: 677afd610bd893745ee5ae506bede2dd URL: https://github.com/blueman-project/blueman BuildRequires: autoconf BuildRequires: automake @@ -71,12 +71,6 @@ Wtyczka Blueman-a dla Thunar-a. %setup -q %build -%{__aclocal} -%{__autoheader} -%{__libtoolize} -%{__intltoolize} -%{__automake} -%{__autoconf} %configure \ --enable-xfce-settings=yes \ --disable-static \ @@ -92,7 +86,8 @@ rm -rf $RPM_BUILD_ROOT %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name} %{__rm} $RPM_BUILD_ROOT%{py_sitedir}/_blueman.la -%py_postclean +# DO NOT RUN py_postclean - breaks plugins and everything + %find_lang %{name} --with-gnome %clean @@ -127,8 +122,8 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %{_mandir}/man1/blueman-report.1 %{_mandir}/man1/blueman-sendto.1* %{_mandir}/man1/blueman-services.1* -%attr(755,root,root) %{_libdir}/%{name}-mechanism -%attr(755,root,root) %{_libdir}/%{name}-rfcomm-watcher +%attr(755,root,root) %{_libexecdir}/%{name}-mechanism +%attr(755,root,root) %{_libexecdir}/%{name}-rfcomm-watcher %{_datadir}/%{name} %{_datadir}/dbus-1/system-services/org.blueman.Mechanism.service %{_desktopdir}/blueman-manager.desktop diff --git a/icon-active.patch b/icon-active.patch deleted file mode 100644 index 0aff7ee..0000000 --- a/icon-active.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: blueman-1.23/blueman/plugins/applet/PowerManager.py -=================================================================== ---- blueman-1.23.orig/blueman/plugins/applet/PowerManager.py 2011-10-08 21:09:16.000000000 +0200 -+++ blueman-1.23/blueman/plugins/applet/PowerManager.py 2012-09-27 02:14:10.481892534 +0200 -@@ -243,6 +243,7 @@ - #return pixbuf - if not self.GetBluetoothStatus(): - return ("blueman-tray-disabled", "bluetooth-disabled") -+ return ("blueman-tray-active", "bluetooth-active") - - def on_adapter_added(self, path): - adapter = Bluez.Adapter(path) diff --git a/missing-icons.patch b/missing-icons.patch deleted file mode 100644 index 0d2aa6b..0000000 --- a/missing-icons.patch +++ /dev/null @@ -1,555 +0,0 @@ -commit 9863fb99aa384e42b8349d505af77c071f8cb6e6 -Author: Christopher Schramm -Date: Sun Oct 13 10:01:32 2013 +0200 - - Add missing icons (fixes #2) - -diff --git a/data/icons/hicolor/scalable/status/Makefile.am b/data/icons/hicolor/scalable/status/Makefile.am -index f0ddd52..2082dfc 100644 ---- a/data/icons/hicolor/scalable/status/Makefile.am -+++ b/data/icons/hicolor/scalable/status/Makefile.am -@@ -4,6 +4,6 @@ context = status - - iconsdir = $(themedir)/$(size)/$(context) - --icons_DATA = blueman-tray-active.svg -+icons_DATA = blueman-tray-active.svg blueman-tray-disabled.svg blueman-tray.svg - - EXTRA_DIST = $(icons_DATA) -diff --git a/data/icons/hicolor/scalable/status/blueman-tray-disabled.svg b/data/icons/hicolor/scalable/status/blueman-tray-disabled.svg -new file mode 100644 -index 0000000..8ee5fe0 ---- /dev/null -+++ b/data/icons/hicolor/scalable/status/blueman-tray-disabled.svg -@@ -0,0 +1,291 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ image/svg+xml -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/data/icons/hicolor/scalable/status/blueman-tray.svg b/data/icons/hicolor/scalable/status/blueman-tray.svg -new file mode 100644 -index 0000000..3624a88 ---- /dev/null -+++ b/data/icons/hicolor/scalable/status/blueman-tray.svg -@@ -0,0 +1,234 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ image/svg+xml -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -- 2.43.0