Merge pull request #250 from ayhanyalcinsoy/master

bluez:version bump to 5.33 close #243
This commit is contained in:
Ertuğrul Erata
2015-08-16 23:45:10 +03:00
2 changed files with 72 additions and 9 deletions
@@ -0,0 +1,59 @@
From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@public.gmane.org>
Date: Sat, 12 Oct 2013 17:45:25 +0200
Subject: [PATCH] Allow using obexd without systemd in the user session
Not all sessions run systemd --user (actually, the majority
doesn't), so the dbus daemon must be able to spawn obexd
directly, and to do so it needs the full path of the daemon.
---
Makefile.obexd | 4 ++--
obexd/src/org.bluez.obex.service | 4 ----
obexd/src/org.bluez.obex.service.in | 4 ++++
3 files changed, 6 insertions(+), 6 deletions(-)
delete mode 100644 obexd/src/org.bluez.obex.service
create mode 100644 obexd/src/org.bluez.obex.service.in
diff --git a/Makefile.obexd b/Makefile.obexd
index 3760867..142e7c3 100644
--- a/Makefile.obexd
+++ b/Makefile.obexd
@@ -2,12 +2,12 @@
if SYSTEMD
systemduserunitdir = @SYSTEMD_USERUNITDIR@
systemduserunit_DATA = obexd/src/obex.service
+endif
dbussessionbusdir = @DBUS_SESSIONBUSDIR@
dbussessionbus_DATA = obexd/src/org.bluez.obex.service
-endif
-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
obex_plugindir = $(libdir)/obex/plugins
diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
deleted file mode 100644
index a538088..0000000
--- a/obexd/src/org.bluez.obex.service
+++ /dev/null
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=org.bluez.obex
-Exec=/bin/false
-SystemdService=dbus-org.bluez.obex.service
diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
new file mode 100644
index 0000000..9c815f2
--- /dev/null
+++ b/obexd/src/org.bluez.obex.service.in
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.bluez.obex
+Exec=@libexecdir@/obexd
+SystemdService=dbus-org.bluez.obex.service
--
1.8.3.1
+13 -9
View File
@@ -14,7 +14,7 @@
<IsA>app:console</IsA>
<Summary>Official Linux Bluetooth protocol stack</Summary>
<Description>bluez contains the tools and libraries that provides support for the core Bluetooth layers and protocols.</Description>
<Archive sha1sum="c1707e8ae38b299c07e6c18ff3c26a4b928d03bf" type="tarxz">https://www.kernel.org/pub/linux/bluetooth/bluez-5.27.tar.xz</Archive>
<Archive sha1sum="d8644269530b6bca1647f0c4cfbb284d88dfe949" type="tarxz">https://www.kernel.org/pub/linux/bluetooth/bluez-5.33.tar.xz</Archive>
<BuildDependencies>
<Dependency>cups-devel</Dependency>
<Dependency>dbus-devel</Dependency>
@@ -29,21 +29,18 @@
<Dependency>readline-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">bluez-5.27-obexd_without_systemd-1.patch</Patch>
<Patch level="1">0001-Allow-using-obexd-without-systemd-in-the-user-session.patch</Patch>
</Patches>
</Source>
<Package>
<Name>bluez</Name>
<RuntimeDependencies>
<Dependency>cups</Dependency>
<Dependency>libnl</Dependency>
<Dependency>libusb</Dependency>
<Dependency>dbus</Dependency>
<Dependency>eudev</Dependency>
<Dependency>glib2</Dependency>
<Dependency>readline</Dependency>
<Dependency>libical</Dependency>
<Dependency>alsa-lib</Dependency>
<Dependency>alsa-lib</Dependency>
<Dependency>gstreamer</Dependency>
<Dependency>libsndfile</Dependency>
<Dependency release="current">bluez-libs</Dependency>
</RuntimeDependencies>
<Files>
@@ -95,6 +92,13 @@
</Package>
<History>
<Update release="9">
<Date>2015-08-16</Date>
<Version>5.33</Version>
<Comment>Version bump.</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
<Update release="8">
<Date>2015-01-29</Date>
<Version>5.27</Version>