leigh123linux pushed to blueman (f20). "clean out the crap"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu May 28 13:43:57 UTC 2015
From 9e70d101c2e6d1f6001f72434363801b5e2e6ced Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux at googlemail.com>
Date: Thu, 28 May 2015 14:34:54 +0100
Subject: clean out the crap
diff --git a/Drop-browse-feature.patch b/Drop-browse-feature.patch
new file mode 100644
index 0000000..37019b6
--- /dev/null
+++ b/Drop-browse-feature.patch
@@ -0,0 +1,472 @@
+From 44fda8a56c909a9d8ed924e39156d8b580e76f25 Mon Sep 17 00:00:00 2001
+From: Christopher Schramm <git at cschramm.eu>
+Date: Thu, 28 May 2015 07:31:18 +0200
+Subject: [PATCH] Drop browse feature
+
+Closes #268
+---
+ CHANGELOG.md | 6 +++
+ apps/Makefile.am | 1 -
+ apps/blueman-browse | 87 --------------------------------
+ apps/blueman-manager | 3 --
+ blueman/gui/manager/ManagerDeviceMenu.py | 9 ----
+ blueman/gui/manager/ManagerToolbar.py | 19 ++-----
+ blueman/plugins/applet/StandardItems.py | 10 ----
+ blueman/plugins/services/Transfer.py | 6 ---
+ data/man/Makefile.am | 1 -
+ data/man/blueman-browse.1 | 22 --------
+ data/org.blueman.gschema.xml | 5 --
+ data/ui/manager-main.ui | 12 -----
+ data/ui/services-transfer.ui | 55 --------------------
+ po/POTFILES.in | 1 -
+ 14 files changed, 11 insertions(+), 226 deletions(-)
+ delete mode 100755 apps/blueman-browse
+ delete mode 100644 data/man/blueman-browse.1
+
+diff --git a/CHANGELOG.md b/CHANGELOG.md
+index c5b5751..ea04343 100644
+--- a/CHANGELOG.md
++++ b/CHANGELOG.md
+@@ -1,5 +1,11 @@
+ # Changelog
+
++## master
++
++### Changes
++
++* Drop browse feature
++
+ ## 2.0
+
+ No relevant changes
+diff --git a/apps/Makefile.am b/apps/Makefile.am
+index 9bfeb12..33d5c21 100644
+--- a/apps/Makefile.am
++++ b/apps/Makefile.am
+@@ -5,7 +5,6 @@ APPS = \
+ blueman-services \
+ blueman-sendto \
+ blueman-assistant \
+- blueman-browse \
+ blueman-report
+
+ appsdir = $(bindir)
+diff --git a/apps/blueman-browse b/apps/blueman-browse
+deleted file mode 100755
+index f0a3cb5..0000000
+--- a/apps/blueman-browse
++++ /dev/null
+@@ -1,87 +0,0 @@
+-#!/usr/bin/env python
+-
+-from __future__ import print_function
+-from __future__ import division
+-from __future__ import absolute_import
+-from __future__ import unicode_literals
+-
+-import os, sys
+-
+-#support running uninstalled
+-_dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
+-if os.path.exists(os.path.join(_dirname, "CHANGELOG.md")):
+- sys.path.insert(0, _dirname)
+-
+-from optparse import OptionParser
+-import gettext
+-import time
+-
+-from blueman.Constants import *
+-import gi
+-gi.require_version("Gtk", "3.0")
+-
+-from blueman.bluez.Manager import Manager
+-from blueman.gui.DeviceSelectorDialog import DeviceSelectorDialog
+-from blueman.Functions import *
+-from blueman.main.Config import Config
+-
+-from gi.repository import Gtk, Gdk
+-
+-class Browse:
+- def __init__(self):
+- setup_icon_path()
+-
+- usage = "Usage: %prog [options]"
+- parser = OptionParser(usage)
+- parser.add_option("-d", "--device", dest="device",
+- action="store", help=_("Browse this device"), metavar="ADDRESS")
+-
+- (options, args) = parser.parse_args()
+- self.options = options
+- self.args = args
+-
+- if options.device == None:
+- dev = self.select_device()
+- if not dev:
+- exit()
+-
+- addr = dev.Address
+-
+- else:
+- addr = options.device
+- addr = addr.strip(" ")
+- conf = Config("org.blueman.transfer")
+-
+- try:
+- if conf["browse-command"]:
+- launch(conf["browse-command"].replace("%d", addr), system=True, name="blueman")
+- else:
+- Gtk.show_uri(None, ('obex://[%s]' % addr), Gdk.CURRENT_TIME)
+- except Exception as e:
+- dprint(e)
+- d = Gtk.MessageDialog(None, buttons=Gtk.ButtonsType.OK, type=Gtk.MessageType.ERROR)
+- if conf["browse-command"]:
+- d.props.text = _("Failed to launch \"%s\"") % conf["browse-command"].split(' ')[0]
+- else:
+- d.props.text = _("Failed to launch default file browser")
+- d.props.secondary_text = "%s\n\n" % e.message + \
+- _("You can enter an alternate browser in service settings")
+- d.run()
+- d.destroy()
+-
+- def select_device(self):
+- d = DeviceSelectorDialog()
+- resp = d.run()
+- d.destroy()
+- if resp == Gtk.ResponseType.ACCEPT:
+- sel = d.GetSelection()
+- if sel:
+- return sel[1]
+- else:
+- return None
+- else:
+- return None
+-
+-
+-set_proc_title()
+-Browse()
+diff --git a/apps/blueman-manager b/apps/blueman-manager
+index 2fadd9c..0369699 100755
+--- a/apps/blueman-manager
++++ b/apps/blueman-manager
+@@ -267,9 +267,6 @@ class Blueman:
+ def remove(self, device):
+ self.List.Adapter.remove_device(device.Device)
+
+- def browse(self, device):
+- launch("blueman-browse -d %s" % device.Address)
+-
+ def disconnect(self, device, *args, **kwargs):
+ applet = AppletService()
+ applet.DisconnectDevice(device.get_object_path(), *args, **kwargs)
+diff --git a/blueman/gui/manager/ManagerDeviceMenu.py b/blueman/gui/manager/ManagerDeviceMenu.py
+index f45f9c4..686342c 100644
+--- a/blueman/gui/manager/ManagerDeviceMenu.py
++++ b/blueman/gui/manager/ManagerDeviceMenu.py
+@@ -300,11 +300,6 @@ class ManagerDeviceMenu(Gtk.Menu):
+ self.append(send_item)
+ send_item.show()
+
+- browse_item = create_menuitem(_("_Browse Device..."), get_icon("document-open", 16))
+- browse_item.props.sensitive = False
+- self.append(browse_item)
+- browse_item.show()
+-
+ uuids = device.UUIDs
+ for uuid in uuids:
+ uuid16 = uuid128_to_uuid16(uuid)
+@@ -312,10 +307,6 @@ class ManagerDeviceMenu(Gtk.Menu):
+ self.Signals.Handle("gobject", send_item, "activate", lambda x: self.Blueman.send(device))
+ send_item.props.sensitive = True
+
+- if uuid16 == OBEX_FILETRANS_SVCLASS_ID:
+- self.Signals.Handle("gobject", browse_item, "activate", lambda x: self.Blueman.browse(device))
+- browse_item.props.sensitive = True
+-
+ item = Gtk.SeparatorMenuItem()
+ item.show()
+ self.append(item)
+diff --git a/blueman/gui/manager/ManagerToolbar.py b/blueman/gui/manager/ManagerToolbar.py
+index f225674..62da709 100644
+--- a/blueman/gui/manager/ManagerToolbar.py
++++ b/blueman/gui/manager/ManagerToolbar.py
+@@ -56,11 +56,6 @@ class ManagerToolbar:
+ self.b_send.connect("clicked", self.on_action, self.blueman.send)
+ self.b_send.set_homogeneous(False)
+
+- self.b_browse = blueman.Builder.get_object("b_browse")
+- self.b_browse.props.sensitive = False
+- self.b_browse.connect("clicked", self.on_action, self.blueman.browse)
+- #self.b_browse.set_homogeneous(False)
+-
+ self.on_adapter_changed(blueman.List, blueman.List.GetAdapterPath())
+
+ def on_action(self, button, func):
+@@ -81,7 +76,7 @@ class ManagerToolbar:
+ dprint("toolbar adapter", adapter_path)
+ if adapter_path == None:
+ self.b_search.props.sensitive = False
+- self.update_send_browse(None)
++ self.update_send(None)
+ else:
+ self.b_search.props.sensitive = True
+
+@@ -119,19 +114,15 @@ class ManagerToolbar:
+ self.b_remove.props.sensitive = True
+ self.b_add.props.sensitive = False
+
+- self.update_send_browse(device)
++ self.update_send(device)
+
+- def update_send_browse(self, device):
++ def update_send(self, device):
+ self.b_send.props.sensitive = False
+- self.b_browse.props.sensitive = False
+ if device != None and not device.Fake:
+ for uuid in device.UUIDs:
+ uuid16 = uuid128_to_uuid16(uuid)
+ if uuid16 == OBEX_OBJPUSH_SVCLASS_ID:
+ self.b_send.props.sensitive = True
+-
+- if uuid16 == OBEX_FILETRANS_SVCLASS_ID:
+- self.b_browse.props.sensitive = True
+ if device and device.Fake:
+ self.b_send.props.sensitive = True
+
+@@ -144,7 +135,7 @@ class ManagerToolbar:
+
+ elif key == "Fake":
+ self.on_device_selected(dev_list, device, iter)
+- self.update_send_browse(device)
++ self.update_send(device)
+
+ elif key == "UUIDs":
+- self.update_send_browse(device)
++ self.update_send(device)
+diff --git a/blueman/plugins/applet/StandardItems.py b/blueman/plugins/applet/StandardItems.py
+index 0aca220..8bc9f46 100644
+--- a/blueman/plugins/applet/StandardItems.py
++++ b/blueman/plugins/applet/StandardItems.py
+@@ -35,11 +35,6 @@ class StandardItems(AppletPlugin):
+
+ self.Applet.Plugins.Menu.Register(self, self.send, 40)
+
+- self.browse = create_menuitem(_("_Browse Files on Device") + "...", get_icon("document-open", 16))
+- self.browse.connect("activate", self.on_browse)
+-
+- self.Applet.Plugins.Menu.Register(self, self.browse, 50)
+-
+ self.Applet.Plugins.Menu.Register(self, Gtk.SeparatorMenuItem(), 51)
+
+ self.devices = create_menuitem(_("_Devices") + "...", get_icon("blueman", 16))
+@@ -84,7 +79,6 @@ class StandardItems(AppletPlugin):
+ sensitive = sensitive and self.Applet.Manager and power
+ self.new_dev.props.sensitive = sensitive
+ self.send.props.sensitive = sensitive
+- self.browse.props.sensitive = sensitive
+ self.devices.props.sensitive = sensitive
+ self.adapters.props.sensitive = sensitive
+
+@@ -94,16 +88,12 @@ class StandardItems(AppletPlugin):
+ def on_power_state_changed(self, manager, state):
+ self.change_sensitivity(state)
+
+-
+ def on_setup_new(self, menu_item):
+ launch("blueman-assistant", None, False, "blueman", _("Bluetooth Assistant"))
+
+ def on_send(self, menu_item):
+ launch("blueman-sendto", None, False, "blueman", _("File Sender"))
+
+- def on_browse(self, menu_item):
+- launch("blueman-browse", None, False, "blueman", _("File Browser"))
+-
+ def on_devices(self, menu_item):
+ launch("blueman-manager", None, False, "blueman", _("Device Manager"))
+
+diff --git a/blueman/plugins/services/Transfer.py b/blueman/plugins/services/Transfer.py
+index 5cc910d..646564d 100644
+--- a/blueman/plugins/services/Transfer.py
++++ b/blueman/plugins/services/Transfer.py
+@@ -46,8 +46,6 @@ class Transfer(ServicePlugin):
+ if key == "shared-path":
+ self.Builder.get_object(key).set_current_folder(value)
+ self.option_changed_notify(key, False)
+- elif key != "browse-command":
+- self.option_changed_notify(key)
+
+ def on_apply(self):
+ if self.on_query_apply_state():
+@@ -66,16 +64,12 @@ class Transfer(ServicePlugin):
+ self._config.connect("changed", self.on_property_changed)
+
+ opp_accept = self.Builder.get_object("opp-accept")
+- obex_cmd = self.Builder.get_object("e-obex-cmd")
+ shared_path = self.Builder.get_object("shared-path")
+
+ opp_accept.props.active = self._config["opp-accept"]
+- if self._config["browse-command"]:
+- obex_cmd.props.text = self._config["browse-command"]
+ if self._config["shared-path"]:
+ shared_path.set_current_folder(self._config["shared-path"])
+
+ opp_accept.connect("toggled", lambda x: self._config.set_boolean("opp-accept", x.props.active))
+- obex_cmd.connect("changed", lambda x: self._config.set_string("browse-command", x.props.text))
+
+ shared_path.connect("file-set", lambda x: self._config.set_string("shared-path", x.get_filename()))
+diff --git a/data/man/Makefile.am b/data/man/Makefile.am
+index 699cccc..0b6ac70 100644
+--- a/data/man/Makefile.am
++++ b/data/man/Makefile.am
+@@ -5,7 +5,6 @@ man_MANS = \
+ blueman-sendto.1 \
+ blueman-services.1 \
+ blueman-assistant.1 \
+- blueman-browse.1 \
+ blueman-report.1
+
+ EXTRA_DIST = $(man_MANS)
+diff --git a/data/man/blueman-browse.1 b/data/man/blueman-browse.1
+deleted file mode 100644
+index 6ee0ecb..0000000
+--- a/data/man/blueman-browse.1
++++ /dev/null
+@@ -1,22 +0,0 @@
+-.TH BLUEMAN-BROWSE 1 LOCAL
+-
+-.SH NAME
+-
+-blueman-browse - Helper application for launching an obex browser
+-
+-.SH SYNOPSIS
+-
+-.B blueman-browse [options]
+-
+-.SH DESCRIPTION
+-
+-blueman-browse Launches an obex browser for specified device, if there is no device specified, it will display a dialog to choose from.
+-
+-.SH OPTIONS
+-.IP --device=ADDRESS
+-Address of the device to browse
+-
+-
+-.SH AUTHOR
+-
+-Valmantas Paliksa
+diff --git a/data/org.blueman.gschema.xml b/data/org.blueman.gschema.xml
+index a4c092b..9252a19 100644
+--- a/data/org.blueman.gschema.xml
++++ b/data/org.blueman.gschema.xml
+@@ -160,11 +160,6 @@
+ <summary>Path for incoming file transfers</summary>
+ <description></description>
+ </key>
+- <key type="s" name="browse-command">
+- <default>""</default>
+- <summary>File Browser Command for OBEXn</summary>
+- <description></description>
+- </key>
+ </schema>
+ <schema id="org.blueman.plugins.serialmanager" path="/org/blueman/plugins/serialmanager/">
+ <key type="s" name="script">
+diff --git a/data/ui/manager-main.ui b/data/ui/manager-main.ui
+index f665dc3..43d4985 100644
+--- a/data/ui/manager-main.ui
++++ b/data/ui/manager-main.ui
+@@ -133,18 +133,6 @@
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+- <child>
+- <object class="GtkToolButton" id="b_browse">
+- <property name="visible">True</property>
+- <property name="tooltip_text" translatable="yes">Browse the device using obex ftp</property>
+- <property name="label" translatable="yes" comments="translators: toolbar item: keep it as short as possible">Browse</property>
+- <property name="icon-name">document-open</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="homogeneous">True</property>
+- </packing>
+- </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+diff --git a/data/ui/services-transfer.ui b/data/ui/services-transfer.ui
+index abb2603..2738751 100644
+--- a/data/ui/services-transfer.ui
++++ b/data/ui/services-transfer.ui
+@@ -92,61 +92,6 @@
+ <property name="position">1</property>
+ </packing>
+ </child>
+- <child>
+- <object class="GtkExpander" id="expander1">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <child>
+- <object class="GtkAlignment" id="alignment3">
+- <property name="visible">True</property>
+- <property name="top_padding">4</property>
+- <property name="left_padding">12</property>
+- <child>
+- <object class="GtkBox" id="vbox4">
+- <property name="orientation">vertical</property>
+- <property name="visible">True</property>
+- <child>
+- <object class="GtkLabel" id="label10">
+- <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="label" translatable="yes">Command to start an obex ftp browser.
+-<i>%d</i> is substituted with device address.</property>
+- <property name="use_markup">True</property>
+- <property name="wrap">True</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkEntry" id="e-obex-cmd">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="invisible_char">●</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="padding">4</property>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- </object>
+- </child>
+- </object>
+- </child>
+- <child type="label">
+- <object class="GtkLabel" id="label7">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes"><b>Advanced</b></property>
+- <property name="use_markup">True</property>
+- </object>
+- </child>
+- </object>
+- <packing>
+- <property name="position">3</property>
+- </packing>
+- </child>
+ </object>
+ </child>
+ </object>
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index a245ed2..e2ff7bf 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -118,4 +118,3 @@ apps/blueman-applet
+ apps/blueman-adapters
+ apps/blueman-sendto
+ apps/blueman-assistant
+-apps/blueman-browse
+--
+2.4.1
+
diff --git a/Rename-blueman-applet.service-to-org.blueman.Applet..patch b/Rename-blueman-applet.service-to-org.blueman.Applet..patch
new file mode 100644
index 0000000..58680f4
--- /dev/null
+++ b/Rename-blueman-applet.service-to-org.blueman.Applet..patch
@@ -0,0 +1,93 @@
+From 49e11eb6622bb4995db959189d7b4c7729e17f02 Mon Sep 17 00:00:00 2001
+From: Christopher Schramm <git at cschramm.eu>
+Date: Sun, 24 May 2015 14:28:17 +0200
+Subject: [PATCH 1/2] Rename blueman-applet.service to
+ org.blueman.Applet.service
+
+---
+ .gitignore | 2 +-
+ configure.ac | 2 +-
+ data/configs/Makefile.am | 6 +++---
+ data/configs/blueman-applet.service.in | 3 ---
+ data/configs/org.blueman.Applet.service.in | 3 +++
+ 5 files changed, 8 insertions(+), 8 deletions(-)
+ delete mode 100644 data/configs/blueman-applet.service.in
+ create mode 100644 data/configs/org.blueman.Applet.service.in
+
+diff --git a/.gitignore b/.gitignore
+index be1636d..2480507 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -37,7 +37,7 @@ Makefile
+ /stamp-h1
+ /blueman/Constants.py
+ /blueman/plugins/mechanism/Rfcomm.py
+-/data/configs/blueman-applet.service
++/data/configs/org.blueman.Applet.service
+ /data/configs/org.blueman.Mechanism.service
+ /module/.deps
+ /po/POTFILES
+diff --git a/configure.ac b/configure.ac
+index 2c140df..a3679eb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -230,7 +230,7 @@ data/icons/main_icon/Makefile
+ data/icons/pixmaps/Makefile
+ data/ui/Makefile
+ data/man/Makefile
+-data/configs/blueman-applet.service
++data/configs/org.blueman.Applet.service
+ data/configs/org.blueman.Mechanism.service
+ module/Makefile
+ po/Makefile.in
+diff --git a/data/configs/Makefile.am b/data/configs/Makefile.am
+index fb3897b..9e23dc2 100644
+--- a/data/configs/Makefile.am
++++ b/data/configs/Makefile.am
+@@ -5,7 +5,7 @@ dbus_servicesdir = $(datadir)/dbus-1/system-services
+ dbus_services_DATA = org.blueman.Mechanism.service
+
+ dbus_sessdir = $(datadir)/dbus-1/services
+-dbus_sess_DATA = blueman-applet.service
++dbus_sess_DATA = org.blueman.Applet.service
+
+ if HAVE_POLKIT
+ @INTLTOOL_POLICY_RULE@
+@@ -15,14 +15,14 @@ policykit_DATA = $(policykit_in_files:.policy.in=.policy)
+ endif
+
+ EXTRA_DIST = org.blueman.Mechanism.conf \
+- blueman-applet.service.in \
++ org.blueman.Applet.service.in \
+ org.blueman.Mechanism.service.in \
+ org.blueman.policy.in
+
+ CLEANFILES = \
+ org.blueman.Mechanism.service \
+ org.blueman.policy \
+- blueman-applet.service \
++ org.blueman.Applet.service \
+ $(BUILT_SOURCES)
+
+ DISTCLEANFILES = \
+diff --git a/data/configs/blueman-applet.service.in b/data/configs/blueman-applet.service.in
+deleted file mode 100644
+index 0ab2c43..0000000
+--- a/data/configs/blueman-applet.service.in
++++ /dev/null
+@@ -1,3 +0,0 @@
+-[D-BUS Service]
+-Name=org.blueman.Applet
+-Exec=@BINDIR@/blueman-applet
+diff --git a/data/configs/org.blueman.Applet.service.in b/data/configs/org.blueman.Applet.service.in
+new file mode 100644
+index 0000000..0ab2c43
+--- /dev/null
++++ b/data/configs/org.blueman.Applet.service.in
+@@ -0,0 +1,3 @@
++[D-BUS Service]
++Name=org.blueman.Applet
++Exec=@BINDIR@/blueman-applet
+--
+2.4.1
+
diff --git a/blueman.spec b/blueman.spec
index e012cbf..16a5b93 100644
--- a/blueman.spec
+++ b/blueman.spec
@@ -2,7 +2,7 @@
Name: blueman
Version: 2.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: GTK+ Bluetooth Manager
Group: Applications/System
@@ -10,21 +10,22 @@ License: GPLv2+
URL: https://github.com/blueman-project/blueman
Source0: https://github.com/blueman-project/blueman/releases/download/%{version}/blueman-%{version}.tar.xz
Patch0: fix_bluetoothd_path.patch
+# upstream patch to remove browse
+Patch1: Drop-browse-feature.patch
+# upstream patch to rename service file
+Patch2: Rename-blueman-applet.service-to-org.blueman.Applet..patch
BuildRequires: gtk3-devel >= 3.10
BuildRequires: pygobject3-devel >= 3.10
BuildRequires: startup-notification-devel >= 0.9
-BuildRequires: bluez-libs-devel >= 4.26
+BuildRequires: bluez-libs-devel >= 4.61
BuildRequires: intltool >= 0.35.0
BuildRequires: dbus-python-devel
BuildRequires: python2-devel >= 2.7
BuildRequires: desktop-file-utils
-BuildRequires: bluez >= 4.61
BuildRequires: notify-python
BuildRequires: Cython >= 0.21
-Requires: python2 >= 2.7
-Requires: bluez >= 4.61
Requires: pygobject3 >= 3.10
Requires: dbus
Requires: dbus-python
@@ -45,23 +46,26 @@ such as:
- Connecting to/Creating bluetooth networks
- Connecting to input devices
- Connecting to audio devices
-- Sending/Receiving/Browsing files via OBEX
+- Sending/Receiving files via OBEX
- Pairing
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
-%build
NOCONFIGURE=yes ./autogen.sh
+
+%build
%configure --disable-static --disable-polkit --enable-thunar-sendto=no --disable-schemas-compile
make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%{make_install}
+
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
desktop-file-install \
@@ -90,39 +94,34 @@ mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/blueman
touch $RPM_BUILD_ROOT%{_sharedstatedir}/blueman/network.state
%post
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
- touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
- glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+ /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+ /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
fi
%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%files -f blueman.lang
%doc CHANGELOG.md FAQ README.md
%license COPYING
%{_bindir}/*
-%{python_sitelib}/blueman
+%{python_sitelib}/blueman/
%{python_sitearch}/*.so
-%{_libexecdir}/blueman-mechanism
-%{_libexecdir}/blueman-rfcomm-watcher
+%{_libexecdir}/blueman-*
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.blueman.Mechanism.conf
%{_sysconfdir}/xdg/autostart/blueman.desktop
-%{_datadir}/applications/blueman-manager.desktop
-%{_datadir}/applications/blueman-adapters.desktop
-%{_datadir}/icons/hicolor/*/actions/*
-%{_datadir}/icons/hicolor/*/apps/*
-%{_datadir}/icons/hicolor/*/devices/*
-%{_datadir}/icons/hicolor/*/status/*
+%{_datadir}/applications/blueman-*.desktop
+%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/pixmaps/blueman/
%{_datadir}/blueman/
-%{_datadir}/dbus-1/services/blueman-applet.service
+%{_datadir}/dbus-1/services/org.blueman.Applet.service
%{_datadir}/dbus-1/system-services/org.blueman.Mechanism.service
%{_datadir}/glib-2.0/schemas/*
%{_mandir}/man1/*
@@ -130,6 +129,14 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%ghost %attr(0644,root,root) %{_sharedstatedir}/blueman/network.state
%changelog
+* Thu May 28 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.0-4
+- remove browse feature (upstream patch)
+- ammend description
+- rename service file (upstream patch)
+- clean up requires and buildrequires
+- update scriptlets
+- clean up spec file
+
* Wed May 27 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.0-3
- add requires dbus-python
- add requires pulseaudio-module-bluetooth for audio
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/blueman.git/commit/?h=f20&id=9e70d101c2e6d1f6001f72434363801b5e2e6ced
More information about the scm-commits
mailing list