Accepting request 961724 from Base:System

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/961724
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bluez?expand=0&rev=185

bluez-5.62.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:38090a5b750e17fc08d3e52178ed8d3254c5f4bd2c48830d5c1955b88e3bc0c2
-size 2149348

bluez-5.63.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9349e11e8160bb3d720835d271250d8a7424d3690f5289e6db6fe07cc66c6d76
+size 2169168

bluez.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Sun Mar  6 20:53:09 UTC 2022 - Martin Wilck <mwilck@suse.com>
+
+- Add code to restore user modifications for modprobe.d %config files
+  after moving the files to %_modprobedir
+- Use %_modprobedir (jsc#SLE-20639)
+
+-------------------------------------------------------------------
+Sat Mar  5 09:07:00 UTC 2022 - Stefan Seyfried <seife+obs@b1-systems.com>
+
+- update to version 5.63:
+  * Fix issue with storing IRK causing invalid read access.
+  * Fix issue with disconnecting due to GattCharacteristic1.MTU.
+  * Add support for Device{Found,Lost} of advertising monitoring.
+
 -------------------------------------------------------------------
 Sat Feb 26 18:20:25 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>
 

bluez.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package bluez
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 # Copyright (c) 2010-2020 B1 Systems GmbH, Vohburg, Germany
 #
 # All modifications and additions to the file contributed by third parties
@@ -23,9 +23,15 @@
 %bcond_with    mesh
 %endif
 %bcond_without bluez_deprecated
-#
+
+%if 0%{?suse_version} < 1550 && 0%{?sle_version} <= 150300
+# systemd-rpm-macros is wrong in 15.3 and below
+%global _modprobedir /lib/modprobe.d
+%endif
+%global modprobe_d_files 50-bluetooth.conf
+
 Name:           bluez
-Version:        5.62
+Version:        5.63
 Release:        0
 Summary:        Bluetooth Stack for Linux
 License:        GPL-2.0-or-later
@@ -246,7 +252,7 @@ autoreconf -fi
 %install
 %make_install
 find %{buildroot} -type f -name "*.la" -delete -print
-install --mode=0644 -D %{SOURCE7} %{buildroot}/%{_sysconfdir}/modprobe.d/50-bluetooth.conf
+install --mode=0644 -D %{SOURCE7} %{buildroot}/%{_modprobedir}/50-bluetooth.conf
 # no idea why this is suddenly necessary...
 install --mode 0755 -d %{buildroot}%{_localstatedir}/lib/bluetooth
 
@@ -303,6 +309,11 @@ touch -r %{SOURCE0} %{buildroot}%{_defaultdocdir}/%{name}/README-mesh.SUSE
 
 %pre
 %service_add_pre bluetooth.service bluetooth-mesh.service
+# Avoid restoring outdated stuff in posttrans
+for _f in %{?modprobe_d_files}; do
+    [ ! -f "/etc/modprobe.d/${_f}.rpmsave" ] || \
+	mv -f "/etc/modprobe.d/${_f}.rpmsave" "/etc/modprobe.d/${_f}.rpmsave.old" || :
+done
 
 %post
 %{?udev_rules_update:%udev_rules_update}
@@ -319,6 +330,13 @@ touch -r %{SOURCE0} %{buildroot}%{_defaultdocdir}/%{name}/README-mesh.SUSE
 %postun
 %service_del_postun bluetooth.service bluetooth-mesh.service
 
+%posttrans
+# Migration of modprobe.conf files to _modprobedir
+for _f in %{?modprobe_d_files}; do
+    [ ! -f "/etc/modprobe.d/${_f}.rpmsave" ] || \
+	mv -fv "/etc/modprobe.d/${_f}.rpmsave" "/etc/modprobe.d/${_f}" || :
+done
+
 %post -n libbluetooth3 -p /sbin/ldconfig
 %postun -n libbluetooth3 -p /sbin/ldconfig
 
@@ -372,8 +390,8 @@ touch -r %{SOURCE0} %{buildroot}%{_defaultdocdir}/%{name}/README-mesh.SUSE
 # not packaged, boo#1151518
 ###%%config %%{_sysconfdir}/dbus-1/system.d/bluetooth-mesh.conf
 %dir %{_localstatedir}/lib/bluetooth
-%dir %{_sysconfdir}/modprobe.d
+%dir %{_modprobedir}
-%config(noreplace) %{_sysconfdir}/modprobe.d/50-bluetooth.conf
+%{_modprobedir}/50-bluetooth.conf
 %{_unitdir}/bluetooth.service
 %if %{with mesh}
 %{_unitdir}/bluetooth-mesh.service