Update to 5.85

Resolves: RHEL-142552
This commit is contained in:
Bastien Nocera 2026-01-26 10:10:25 +01:00
parent 3fbec99846
commit 764499174b
4 changed files with 40 additions and 15 deletions

View File

@ -0,0 +1,27 @@
From c9ec6137b16aaf371b311f4777a042ec1175719b Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Thu, 29 Jan 2026 13:40:52 +0100
Subject: [PATCH] build: Don't install btmgmt man page as tool isn't
The btmgmt tool isn't installed through the Makefiles, so the
man page shouldn't be installed either.
---
Makefile.tools | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.tools b/Makefile.tools
index 561b03d0b95b..f0b106fae7ef 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -355,7 +355,7 @@ profiles_iap_iapd_LDADD = gdbus/libgdbus-internal.la $(GLIB_LIBS) $(DBUS_LIBS)
if MANPAGES
man_MANS += tools/rctest.1 tools/l2ping.1 tools/btattach.1 tools/isotest.1 \
- tools/btmgmt.1 client/bluetoothctl.1 \
+ client/bluetoothctl.1 \
client/bluetoothctl-mgmt.1 \
client/bluetoothctl-monitor.1 client/bluetoothctl-admin.1 \
client/bluetoothctl-advertise.1 client/bluetoothctl-endpoint.1 \
--
2.52.0

View File

@ -5,8 +5,8 @@
%endif
Name: bluez
Version: 5.83
Release: 2%{?dist}
Version: 5.85
Release: 1%{?dist}
Summary: Bluetooth utilities
License: GPLv2+
URL: http://www.bluez.org/
@ -18,8 +18,8 @@ Source1: bluez.gitignore
Patch1: 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
# https://patchwork.kernel.org/project/bluetooth/patch/20240214155019.325715-1-hadess@hadess.net/
Patch2: 0001-Add-missing-mesh-gatt-JSON-files.patch
# Upstream fixes
Patch3: 5.83-fixes.patch
# https://patchwork.kernel.org/project/bluetooth/patch/20260129125948.2724071-2-hadess@hadess.net/
Patch3: 0001-build-Don-t-install-btmgmt-man-page-as-tool-isn-t.patch
BuildRequires: dbus-devel >= 1.6
BuildRequires: glib2-devel
@ -172,11 +172,6 @@ done
# Red Hat Bugzilla bug #1699680
install -m0755 tools/avinfo $RPM_BUILD_ROOT%{_bindir}
# btmgmt is not installed by "make install", but it is useful for debugging
# some issues and to set the MAC address on HCIs which don't have their
# MAC address configured
install -m0755 tools/btmgmt $RPM_BUILD_ROOT%{_bindir}
# Remove libtool archive
find $RPM_BUILD_ROOT -name '*.la' -delete
@ -244,7 +239,6 @@ install emulator/btvirt ${RPM_BUILD_ROOT}/%{_libexecdir}/bluetooth/
%{_bindir}/bluemoon
%{_bindir}/bluetoothctl
%{_bindir}/btattach
%{_bindir}/btmgmt
%{_bindir}/btmon
%{_bindir}/hex2hcd
%{_bindir}/l2ping
@ -252,7 +246,6 @@ install emulator/btvirt ${RPM_BUILD_ROOT}/%{_libexecdir}/bluetooth/
%{_mandir}/man1/bluetoothctl.1.*
%{_mandir}/man1/bluetoothctl-*.1.*
%{_mandir}/man1/btattach.1.*
%{_mandir}/man1/btmgmt.1.*
%{_mandir}/man1/btmon.1.*
%{_mandir}/man1/l2ping.1.*
%{_mandir}/man8/bluetoothd.8.*
@ -301,6 +294,7 @@ install emulator/btvirt ${RPM_BUILD_ROOT}/%{_libexecdir}/bluetooth/
%{_mandir}/man1/rctest.1.*
%{_mandir}/man5/org.bluez.*.5.*
%{_mandir}/man7/hci.7.*
%{_mandir}/man7/iso.7.*
%{_mandir}/man7/l2cap.7.*
%{_mandir}/man7/mgmt.7.*
%{_mandir}/man7/rfcomm.7.*
@ -338,6 +332,10 @@ install emulator/btvirt ${RPM_BUILD_ROOT}/%{_libexecdir}/bluetooth/
%{_userunitdir}/obex.service
%changelog
* Mon Jan 26 2026 Bastien Nocera <bnocera@redhat.com> - 5.85-1
- Update to 5.85
Resolves: RHEL-142552
* Mon Aug 18 2025 Bastien Nocera <bnocera@redhat.com> - 5.83-1
- Fix problem with menu handling
Resolves: RHEL-103966

View File

@ -1 +1 @@
SHA512 (bluez-5.83.tar.xz) = d2ab04e5d2458249964305c991c5d0c1678d24927019e5b6e10d2f8e1350e3f7d7c783fd3770874dc621a699171b68de6678bead1dcb6e6e73c9863248f26aaa
SHA512 (bluez-5.85.tar.xz) = 5bee1734dc0e67e99a655b894b0a191d43a3ca9d7834186dcbf82a0f1e51c510723a9877e0b1a0bf53296c22acc8eae8260a04d8d288d94c37310b4ac6bc0a69

View File

@ -12,13 +12,13 @@ set -ex
bluemoon --help
# Is bluetoothctl present and doesn't fail if called
bluetoothctl --help
bluetoothctl --timeout 2 --help
# Is btattach present and doesn't fail if called
btattach --version
# Is btmgmt present and doesn't fail if called
btmgmt --help
# Is bluetoothctl mgmt's menu is present and doesn't fail if called
bluetoothctl --timeout 2 --help | grep mgmt
# Is btmon present and doesn't fail if called
btmon --help