From ea094066f4717e55a6c5a9463e099fe8692bcddfac8308140cb6dc42dd3015ef Mon Sep 17 00:00:00 2001 From: Joey Lee Date: Mon, 21 Aug 2023 04:11:51 +0000 Subject: [PATCH] Accepting request 1104774 from home:gmbr3:Active - Use %_firmwaredir OBS-URL: https://build.opensuse.org/request/show/1104774 OBS-URL: https://build.opensuse.org/package/show/Base:System/bluez?expand=0&rev=348 --- bluez.changes | 5 +++++ bluez.spec | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/bluez.changes b/bluez.changes index a6483a6..23b3669 100644 --- a/bluez.changes +++ b/bluez.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Aug 19 13:42:08 UTC 2023 - Callum Farmer + +- Use %_firmwaredir + ------------------------------------------------------------------- Wed Aug 16 01:56:45 UTC 2023 - Joey Lee diff --git a/bluez.spec b/bluez.spec index 9f3dc68..88f3384 100644 --- a/bluez.spec +++ b/bluez.spec @@ -30,6 +30,10 @@ %endif %global modprobe_d_files 50-bluetooth.conf +%if %{undefined _firmwaredir} +%define _firmwaredir /lib/firmware +%endif + Name: bluez Version: 5.68 Release: 0 @@ -235,7 +239,7 @@ export CC=gcc-8 %endif # header file has "#ifndef FIRMWARE_DIR...#define FIRMWARE_DIR /etc/firmare" # instead of patching, just supply FIRMWARE_DIR on compiler's command line -export CPPFLAGS="$CPPFLAGS -DFIRMWARE_DIR='\"/lib/firmware\"'" +export CPPFLAGS="$CPPFLAGS -DFIRMWARE_DIR='\"%{_firmwaredir}\"'" # because of patch4... autoreconf -fi # --enable-experimental is needed or btattach does not build (bug?)