Updated to 5.51

This commit is contained in:
VictorR2007 2019-09-27 14:46:23 +03:00
parent 53f491b33e
commit d22a0919eb
3 changed files with 45 additions and 37 deletions

View file

@ -1,34 +0,0 @@
diff -urN bluez-5.50/Makefile.obexd bluez-5.50-patched/Makefile.obexd
--- bluez-5.50/Makefile.obexd 2018-06-01 11:37:35.000000000 +0300
+++ bluez-5.50-patched/Makefile.obexd 2018-06-05 09:28:26.537699230 +0300
@@ -1,12 +1,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
if OBEX
diff -urN bluez-5.50/obexd/src/org.bluez.obex.service bluez-5.50-patched/obexd/src/org.bluez.obex.service
--- bluez-5.50/obexd/src/org.bluez.obex.service 2012-12-24 21:46:55.000000000 +0400
+++ bluez-5.50-patched/obexd/src/org.bluez.obex.service 1970-01-01 03:00:00.000000000 +0300
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=org.bluez.obex
-Exec=/bin/false
-SystemdService=dbus-org.bluez.obex.service
diff -urN bluez-5.50/obexd/src/org.bluez.obex.service.in bluez-5.50-patched/obexd/src/org.bluez.obex.service.in
--- bluez-5.50/obexd/src/org.bluez.obex.service.in 1970-01-01 03:00:00.000000000 +0300
+++ bluez-5.50-patched/obexd/src/org.bluez.obex.service.in 2018-06-05 09:30:29.454367592 +0300
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.bluez.obex
+Exec=@libexecdir@/obexd
+SystemdService=dbus-org.bluez.obex.service

View file

@ -0,0 +1,34 @@
diff -urN bluez-5.51/Makefile.obexd bluez-5.51-patched/Makefile.obexd
--- bluez-5.51/Makefile.obexd 2019-09-19 21:51:02.000000000 +0300
+++ bluez-5.51-patched/Makefile.obexd 2019-09-27 13:42:04.437366618 +0300
@@ -1,12 +1,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
if OBEX
diff -urN bluez-5.51/obexd/src/org.bluez.obex.service bluez-5.51-patched/obexd/src/org.bluez.obex.service
--- bluez-5.51/obexd/src/org.bluez.obex.service 2012-12-24 21:46:55.000000000 +0400
+++ bluez-5.51-patched/obexd/src/org.bluez.obex.service 1970-01-01 03:00:00.000000000 +0300
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=org.bluez.obex
-Exec=/bin/false
-SystemdService=dbus-org.bluez.obex.service
diff -urN bluez-5.51/obexd/src/org.bluez.obex.service.in bluez-5.51-patched/obexd/src/org.bluez.obex.service.in
--- bluez-5.51/obexd/src/org.bluez.obex.service.in 1970-01-01 03:00:00.000000000 +0300
+++ bluez-5.51-patched/obexd/src/org.bluez.obex.service.in 2019-09-27 13:43:58.700696733 +0300
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.bluez.obex
+Exec=@libexecdir@/obexd
+SystemdService=dbus-org.bluez.obex.service

View file

@ -4,8 +4,8 @@
Summary: Official Linux Bluetooth protocol stack Summary: Official Linux Bluetooth protocol stack
Name: bluez Name: bluez
Version: 5.50 Version: 5.51
Release: 7 Release: 1
License: GPLv2+ License: GPLv2+
Group: Communications Group: Communications
Url: http://www.bluez.org/ Url: http://www.bluez.org/
@ -21,7 +21,7 @@ Patch0: bluez-5.36-systemd-conditional.patch
## Ubuntu patches ## Ubuntu patches
Patch1: 0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch Patch1: 0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch
# Non-upstream # Non-upstream
Patch2: bluez-5.50-allow-using-obexd-without-systemd-in-the-user-sessio.patch Patch2: bluez-5.51-allow-using-obexd-without-systemd-in-the-user-sessio.patch
Patch3: 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch Patch3: 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
Patch4: 0004-agent-Assert-possible-infinite-loop.patch Patch4: 0004-agent-Assert-possible-infinite-loop.patch
BuildRequires: bison BuildRequires: bison
@ -31,6 +31,7 @@ BuildRequires: elfutils-devel
BuildRequires: readline-devel BuildRequires: readline-devel
BuildRequires: sbc-devel BuildRequires: sbc-devel
BuildRequires: speexdsp-devel BuildRequires: speexdsp-devel
BuildRequires: json-c-devel
BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(expat)
@ -62,12 +63,14 @@ These are the official Bluetooth communication libraries for Linux.
%{_bindir}/hcitool %{_bindir}/hcitool
%{_bindir}/hex2hcd %{_bindir}/hex2hcd
%{_bindir}/l2ping %{_bindir}/l2ping
%{_bindir}/meshctl
%{_bindir}/mpris-proxy %{_bindir}/mpris-proxy
%{_bindir}/rfcomm %{_bindir}/rfcomm
%{_bindir}/sdptool %{_bindir}/sdptool
%{_libexecdir}/bluetooth/bluetoothd %{_libexecdir}/bluetooth/bluetoothd
%{_libexecdir}/bluetooth/obexd %{_libexecdir}/bluetooth/obexd
%{_unitdir}/bluetooth-logger.service %{_unitdir}/bluetooth-logger.service
%{_unitdir}/bluetooth-mesh.service
%{_unitdir}/bluetooth.service %{_unitdir}/bluetooth.service
%{_unitdir}/dbus-org.bluez.service %{_unitdir}/dbus-org.bluez.service
%{_userunitdir}/obex.service %{_userunitdir}/obex.service
@ -87,10 +90,13 @@ These are the official Bluetooth communication libraries for Linux.
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/*.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/*.conf
%config(noreplace) %{_sysconfdir}/bluetooth %config(noreplace) %{_sysconfdir}/bluetooth
%{_datadir}/dbus-1/system-services/org.bluez.service %{_datadir}/dbus-1/system-services/org.bluez.service
%{_datadir}/dbus-1/system-services/org.bluez.mesh.service
%{_datadir}/dbus-1/services/org.bluez.obex.service %{_datadir}/dbus-1/services/org.bluez.obex.service
%{_datadir}/zsh/site-functions/_bluetoothctl
%{_localstatedir}/lib/bluetooth %{_localstatedir}/lib/bluetooth
%dir %{_libdir}/bluetooth %dir %{_libdir}/bluetooth
%{_libdir}/bluetooth/btmon-logger %{_libdir}/bluetooth/btmon-logger
%{_libdir}/bluetooth/bluetooth-meshd
%dir %{_libdir}/bluetooth/plugins %dir %{_libdir}/bluetooth/plugins
%{_libdir}/bluetooth/plugins/sixaxis.so %{_libdir}/bluetooth/plugins/sixaxis.so
%{_udevrulesdir}/97-bluetooth.rules %{_udevrulesdir}/97-bluetooth.rules
@ -230,6 +236,8 @@ autoreconf -fi
--enable-obex \ --enable-obex \
--enable-client \ --enable-client \
--enable-systemd \ --enable-systemd \
--enable-mesh \
--enable-btpclient \
--with-systemdsystemunitdir=%{_unitdir} \ --with-systemdsystemunitdir=%{_unitdir} \
--with-systemduserunitdir=%{_userunitdir} \ --with-systemduserunitdir=%{_userunitdir} \
--with-udevdir=/lib/udev \ --with-udevdir=/lib/udev \