diff --git a/bluez-5.66.tar.xz b/bluez-5.66.tar.xz deleted file mode 100644 index 54461d5170726da5fc7f02db9d4e30dd238e4597..0000000000000000000000000000000000000000 Binary files a/bluez-5.66.tar.xz and /dev/null differ diff --git a/bluez-5.69-linkage.patch b/bluez-5.69-linkage.patch new file mode 100644 index 0000000000000000000000000000000000000000..2a67bc97298f17f3aba78c288d6ed05491b5338f --- /dev/null +++ b/bluez-5.69-linkage.patch @@ -0,0 +1,22 @@ +--- bluez-5.69/Makefile.plugins.orig 2023-08-26 12:38:40.680616100 +0800 ++++ bluez-5.69/Makefile.plugins 2023-08-26 12:39:03.948362100 +0800 +@@ -113,7 +113,7 @@ + plugin_LTLIBRARIES += plugins/sixaxis.la + plugins_sixaxis_la_SOURCES = plugins/sixaxis.c + plugins_sixaxis_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version +-plugins_sixaxis_la_LIBADD = $(UDEV_LIBS) ++plugins_sixaxis_la_LIBADD = $(UDEV_LIBS) $(GLIB_LIBS) + plugins_sixaxis_la_CFLAGS = $(AM_CFLAGS) -fvisibility=hidden + endif + +--- bluez-5.69/Makefile.in.orig 2023-08-26 12:39:55.929298600 +0800 ++++ bluez-5.69/Makefile.in 2023-08-26 12:40:35.129038700 +0800 +@@ -3563,7 +3563,7 @@ + builtin_ldadd = $(am__append_28) + @SIXAXIS_TRUE@plugins_sixaxis_la_SOURCES = plugins/sixaxis.c + @SIXAXIS_TRUE@plugins_sixaxis_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version +-@SIXAXIS_TRUE@plugins_sixaxis_la_LIBADD = $(UDEV_LIBS) ++@SIXAXIS_TRUE@plugins_sixaxis_la_LIBADD = $(UDEV_LIBS) $(GLIB_LIBS) + @SIXAXIS_TRUE@plugins_sixaxis_la_CFLAGS = $(AM_CFLAGS) -fvisibility=hidden + @MAINTAINER_MODE_TRUE@plugins_external_dummy_la_SOURCES = plugins/external-dummy.c + @MAINTAINER_MODE_TRUE@plugins_external_dummy_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version \ diff --git a/bluez-5.69.tar.xz b/bluez-5.69.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..469e51fd6d1a3c46d6bdf5e8ec2a4337a9e8a508 Binary files /dev/null and b/bluez-5.69.tar.xz differ diff --git a/bluez.spec b/bluez.spec index dbb098af036c12b40fe7f0053cf68a03c936f3b6..9980be00484b6c732da7c34e22d5500f36559105 100644 --- a/bluez.spec +++ b/bluez.spec @@ -1,19 +1,29 @@ -%define anolis_release 2 +%define anolis_release 1 %bcond_with deprecated Name: bluez -Version: 5.66 +Version: 5.69 Release: %{anolis_release}%{?dist} Summary: Bluetooth utilities License: GPLv2+ URL: http://www.bluez.org/ Source0: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.xz - -BuildRequires: make python3-docutils -BuildRequires: systemd-devel dbus-devel >= 1.6 glib2-devel libell-devel >= 0.37 -BuildRequires: libical-devel readline-devel json-c-devel cups-devel - -Requires: dbus >= 1.6 +Patch0: bluez-5.69-linkage.patch + +BuildRequires: make +BuildRequires: /usr/bin/rst2man +BuildRequires: cups-devel +BuildRequires: readline-devel +BuildRequires: pkgconfig(dbus-1) >= 1.10 +BuildRequires: pkgconfig(ell) >= 0.39 +BuildRequires: pkgconfig(glib-2.0) >= 2.28 +BuildRequires: pkgconfig(gthread-2.0) >= 2.16 +BuildRequires: pkgconfig(json-c) >= 0.13 +BuildRequires: pkgconfig(libical) +BuildRequires: pkgconfig(libudev) >= 172 +BuildRequires: pkgconfig(systemd) + +Requires: dbus >= 1.10 Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -124,7 +134,7 @@ BuildArch: noarch Doc files for Bluetooth applications %prep -%autosetup +%autosetup -p1 %build %configure --enable-tools \ @@ -202,8 +212,7 @@ install emulator/btvirt %{buildroot}/%{_libexecdir}/bluetooth/ %files %dir %{_sysconfdir}/bluetooth -%config %{_sysconfdir}/bluetooth/main.conf -%config %{_sysconfdir}/dbus-1/system.d/bluetooth.conf +%config(noreplace) %{_sysconfdir}/bluetooth/main.conf %{_bindir}/avinfo %{_bindir}/bluemoon %{_bindir}/bluetoothctl @@ -220,10 +229,14 @@ install emulator/btvirt %{buildroot}/%{_libexecdir}/bluetooth/ %{_libdir}/bluetooth/ %{_localstatedir}/lib/bluetooth +%{_datadir}/dbus-1/system.d/bluetooth.conf %{_datadir}/dbus-1/system-services/org.bluez.service %{_datadir}/zsh/site-functions/_bluetoothctl %{_unitdir}/bluetooth.service +%{_mandir}/man1/bluetoothctl-mgmt.1.* +%{_mandir}/man1/bluetoothctl-monitor.1.* +%{_mandir}/man1/btmgmt.1.* %{_mandir}/man1/btattach.1.* %{_mandir}/man1/btmon.1.* %{_mandir}/man1/l2ping.1.* @@ -253,7 +266,7 @@ install emulator/btvirt %{buildroot}/%{_libexecdir}/bluetooth/ %files libs %{_libdir}/libbluetooth.so.3 -%{_libdir}/libbluetooth.so.3.19.8 +%{_libdir}/libbluetooth.so.3.* %license COPYING %files libs-devel @@ -275,10 +288,10 @@ install emulator/btvirt %{buildroot}/%{_libexecdir}/bluetooth/ %{_mandir}/man1/hid2hci.1* %files mesh -%config %{_sysconfdir}/bluetooth/mesh-main.conf -%config %{_sysconfdir}/dbus-1/system.d/bluetooth-mesh.conf +%config(noreplace) %{_sysconfdir}/bluetooth/mesh-main.conf %{_bindir}/mesh-cfgclient %{_bindir}/mesh-cfgtest +%{_datadir}/dbus-1/system.d/bluetooth-mesh.conf %{_datadir}/dbus-1/system-services/org.bluez.mesh.service %{_libexecdir}/bluetooth/bluetooth-meshd %{_unitdir}/bluetooth-mesh.service @@ -294,6 +307,9 @@ install emulator/btvirt %{buildroot}/%{_libexecdir}/bluetooth/ %doc ChangeLog AUTHORS %changelog +* Sat Aug 26 2023 Funda Wang - 5.69-1 +- New version 5.69 + * Sat Apr 15 2023 Yuanhong Peng - 5.66-2 - Refactor the specfile