From f4cb2a18bf58738ea2d7847a83d165650515d9e77dff9768d80300768a8bb89e Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Sun, 21 Mar 2021 19:57:44 +0000 Subject: [PATCH] Accepting request 880400 from home:michals - Fix build on Leap which does not have %_firmwaredir - use %_firmwaredir OBS-URL: https://build.opensuse.org/request/show/880400 OBS-URL: https://build.opensuse.org/package/show/hardware/zd1211-firmware?expand=0&rev=7 --- zd1211-firmware.changes | 10 ++++++++++ zd1211-firmware.spec | 16 +++++++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/zd1211-firmware.changes b/zd1211-firmware.changes index 299a6de..afb43f9 100644 --- a/zd1211-firmware.changes +++ b/zd1211-firmware.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Mar 21 10:42:29 UTC 2021 - Michal Suchanek + +- Fix build on Leap which does not have %_firmwaredir + +------------------------------------------------------------------- +Mon Oct 19 13:06:22 UTC 2020 - Ludwig Nussel + +- use %_firmwaredir + ------------------------------------------------------------------- Tue Oct 7 00:43:50 CEST 2014 - dsterba@suse.cz diff --git a/zd1211-firmware.spec b/zd1211-firmware.spec index e5bd0bd..2619b92 100644 --- a/zd1211-firmware.spec +++ b/zd1211-firmware.spec @@ -1,7 +1,7 @@ # # spec file for package zd1211-firmware # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,19 +12,21 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # # icecream 0 +%{?!_firmwaredir:%define _firmwaredir /lib/firmware} + Name: zd1211-firmware Version: 1.5 Release: 0 Summary: Firmware for ZD1211 USB WLAN sticks -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Hardware/Wifi Source: http://downloads.sourceforge.net/zd1211/zd1211-firmware-%{version}.tar.bz2 -Url: http://zd1211.ath.cx/ +URL: http://zd1211.ath.cx/ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Modules: zd1211rw.ko @@ -68,8 +70,8 @@ Firmware for USB WLAN sticks based on the ZyDAS ZD1211 chip %build %install -install -d -m 755 %{buildroot}/lib/firmware/zd1211 -install -m 644 zd* %{buildroot}/lib/firmware/zd1211 +install -d -m 755 %{buildroot}%{_firmwaredir}/zd1211 +install -m 644 zd* %{buildroot}%{_firmwaredir}/zd1211 %clean rm -rf %{buildroot} @@ -77,6 +79,6 @@ rm -rf %{buildroot} %files %defattr(-, root, root) %doc README COPYING -/lib/firmware/zd1211 +%{_firmwaredir}/zd1211 %changelog