Revert version 5.48

0001-bluez-allow-using-obexd-without-systemd-in-the-user-sessio.patch

@@ -0,0 +1,34 @@
+diff -urN bluez-5.48/Makefile.obexd bluez-5.48-patched/Makefile.obexd
+--- bluez-5.48/Makefile.obexd	2015-03-11 13:01:57.000000000 +0300
++++ bluez-5.48-patched/Makefile.obexd	2020-03-09 19:26:21.826968140 +0300
+@@ -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 -urN bluez-5.48/obexd/src/org.bluez.obex.service bluez-5.48-patched/obexd/src/org.bluez.obex.service
+--- bluez-5.48/obexd/src/org.bluez.obex.service	2012-12-24 21:46:55.000000000 +0400
++++ bluez-5.48-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.48/obexd/src/org.bluez.obex.service.in bluez-5.48-patched/obexd/src/org.bluez.obex.service.in
+--- bluez-5.48/obexd/src/org.bluez.obex.service.in	1970-01-01 03:00:00.000000000 +0300
++++ bluez-5.48-patched/obexd/src/org.bluez.obex.service.in	2020-03-09 19:29:34.660966382 +0300
+@@ -0,0 +1,4 @@
++[D-BUS Service]
++Name=org.bluez.obex
++Exec=@libexecdir@/obexd
++SystemdService=dbus-org.bluez.obex.service

bluez-5.51-allow-using-obexd-without-systemd-in-the-user-sessio.patch

@@ -1,34 +0,0 @@
-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

bluez.spec

@@ -22,7 +22,7 @@ Patch0: bluez-5.36-systemd-conditional.patch
 Patch1: 0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch
 Patch2: 0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
 Patch3: 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
-Patch4: bluez-5.51-allow-using-obexd-without-systemd-in-the-user-sessio.patch
+Patch4: 0001-bluez-allow-using-obexd-without-systemd-in-the-user-sessio.patch
 Patch5: fix-lp1750308-upstream-commit-1bf03369.patch
 Patch6: fix_build_with_5.2-rc2_kernel_headers.patch
 Patch7: 0004-agent-Assert-possible-infinite-loop.patch