From ecea3f585b225258a76860388ec8d11322a24159 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 20:51:19 +0100 Subject: [PATCH] set libexecdir to standard location instead of /%_lib [release 5.56-2mamba;Mon Mar 08 2021] --- bluez.spec | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/bluez.spec b/bluez.spec index 307566b..d511721 100644 --- a/bluez.spec +++ b/bluez.spec @@ -1,6 +1,6 @@ Name: bluez Version: 5.56 -Release: 1mamba +Release: 2mamba Summary: Userspace tools for the Bluetooth wireless library for Linux Group: Applications/Communication Vendor: openmamba @@ -31,8 +31,7 @@ Requires: bluez-firmware Requires: libbluetooth = %{version}-%{release} Conflicts: bluez4 Provides: bluez5 -Obsoletes: bluez5 -BuildRoot: %{_tmppath}/%{name}-%{version}-root +Obsoletes: bluez5 < 5.56 %description Userspace tools for the Bluetooth wireless library for Linux. @@ -42,7 +41,7 @@ Group: System/Libraries Summary: The Bluetooth wireless library for Linux Conflicts: libbluetooth4 Provides: libbluetooth5 -Obsoletes: libbluetooth5 +Obsoletes: libbluetooth5 < 5.56 Provides: libbluez %description -n libbluetooth @@ -54,13 +53,12 @@ Summary: Static libraries and headers for libbluetooth Requires: libbluetooth = %{version}-%{release} Conflicts: libbluetooth4-devel Provides: libbluetooth5-devel -Obsoletes: libbluetooth5-devel +Obsoletes: libbluetooth5-devel < 5.56 Provides: libbluez-devel %description -n libbluetooth-devel The Bluetooth wireless library for Linux. - -This package contains static libraries and header files need for development. +This package contains static libraries and header files neeed for development. %debug_package @@ -73,7 +71,7 @@ This package contains static libraries and header files need for development. %build %configure \ - --libexecdir=/%{_lib} \ + --libexecdir=%{_libexecdir} \ --enable-tools \ --enable-deprecated \ --enable-cups \ @@ -103,10 +101,6 @@ done : %post -# new install -# -# disable service by default as it is started by udev now -/sbin/chkconfig --del bluetooth 2>&1 &>/dev/null %systemd_post bluetooth %systemd_user_post obex if [ $1 -gt 1 ]; then @@ -133,8 +127,8 @@ find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \; %config %{_sysconfdir}/dbus-1/system.d/bluetooth.conf %{_bindir}/* #/lib/udev/hid2hci -/%{_lib}/bluetooth/bluetoothd -/%{_lib}/bluetooth/obexd +%dir %{_libexecdir}/bluetooth +%{_libexecdir}/bluetooth/* %{_unitdir}/bluetooth.service #%{_udevrulesdir}/97-hid2hci.rules %{_userunitdir}/obex.service @@ -160,6 +154,9 @@ find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \; %doc ChangeLog README %changelog +* Mon Mar 08 2021 Silvan Calarco 5.56-2mamba +- set libexecdir to standard location instead of /%_lib + * Tue Feb 23 2021 Automatic Build System 5.56-1mamba - automatic version update by autodist