From 33ebd59622948389555fea3d2e1558fe09aa81a9 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Aug 04 2023 07:41:06 +0000
Subject: Merge Marvell libertas WiFi firmware


Merge libertas into a single package as they're only 2mb.

---

diff --git a/linux-firmware.spec b/linux-firmware.spec
index e6c0e45..085527e 100644
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -94,8 +94,9 @@ Provides:	iwl3945-firmware = %{version}-%{release}
 Provides:	iwl4965-firmware = %{version}-%{release}
 %description -n iwlegacy-firmware
 This package contains the firmware required by the iwlegacy driver
-for Linux.  Usage of the firmware is subject to the terms and conditions
-contained inside the provided LICENSE file. Please read it carefully.
+for Linux. This includes the 3945(A)BG and 4965AGN WiFi NICs. Usage
+of the firmware is subject to the terms and conditions contained
+inside the provided LICENSE file. Please read it carefully.
 
 %package -n iwlwifi-dvm-firmware
 Summary:	DVM Firmware for Intel(R) Wireless WiFi adapters
@@ -127,7 +128,7 @@ Provides:	iwl6000g2b-firmware = %{version}-%{release}
 Provides:	iwl6050-firmware = %{version}-%{release}
 %description -n iwlwifi-dvm-firmware
 This package contains the firmware required by the iwlwifi driver
-for Linux built with DVM firmware support (CONFIG_IWLDVM=y/m).  Usage of
+for Linux built with DVM firmware support (CONFIG_IWLDVM=y/m). Usage of
 the firmware is subject to the terms and conditions contained inside the
 provided LICENSE file. Please read it carefully.
 
@@ -147,35 +148,21 @@ for Linux built with MVM firmware support (CONFIG_IWLMVM=y/m).  Usage of
 the firmware is subject to the terms and conditions contained inside the
 provided LICENSE file. Please read it carefully.
 
-%package -n libertas-sd8686-firmware
-Summary:	Firmware for Marvell Libertas SD 8686 Network Adapter
+%package -n libertas-firmware
+Summary:	Firmware for Marvell Libertas SD/USB WiFi Network Adapters
 License:	Redistributable, no modification permitted
 Requires:	linux-firmware-whence
-%description -n libertas-sd8686-firmware
-Firmware for Marvell Libertas SD 8686 Network Adapter
-
-%package -n libertas-sd8787-firmware
-Summary:	Firmware for Marvell Libertas SD 8787 Network Adapter
-License:	Redistributable, no modification permitted
-Requires:	linux-firmware-whence
-%description -n libertas-sd8787-firmware
-Firmware for Marvell Libertas SD 8787 Network Adapter
-
-%package -n libertas-usb8388-firmware
-Summary:	Firmware for Marvell Libertas USB 8388 Network Adapter
-License:	Redistributable, no modification permitted
-Epoch:		2 
-Requires:	linux-firmware-whence
-%description -n libertas-usb8388-firmware
-Firmware for Marvell Libertas USB 8388 Network Adapter
-
-%package -n libertas-usb8388-olpc-firmware
-Summary:	OLPC firmware for Marvell Libertas USB 8388 Network Adapter
-License:	Redistributable, no modification permitted
-Requires:	linux-firmware-whence
-%description -n libertas-usb8388-olpc-firmware
-Firmware for Marvell Libertas USB 8388 Network Adapter with OLPC mesh network
-support.
+Obsoletes:      libertas-sd8686-firmware < %{version}-%{release}
+Obsoletes:      libertas-sd8787-firmware < %{version}-%{release}
+Obsoletes:      libertas-usb8388-firmware < 2:%{version}-%{release}
+Obsoletes:      libertas-usb8388-olpc-firmware < %{version}-%{release}
+Provides:       libertas-sd8686-firmware < %{version}-%{release}
+Provides:       libertas-sd8787-firmware < %{version}-%{release}
+Provides:       libertas-usb8388-firmware < 2:%{version}-%{release}
+Provides:       libertas-usb8388-olpc-firmware < %{version}-%{release}
+%description -n libertas-firmware
+Firmware for the Marvell Libertas series of WiFi Network Adapters
+Including the SD 8686/8787 and USB 8388/8388.
 
 %package -n mt7xxx-firmware
 Summary:	Firmware for Mediatek 7600/7900 series WiFi/Bluetooth adapters
@@ -404,25 +391,14 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
 %{_firmwarepath}/iwlwifi-ty-a0*
 %{_firmwarepath}/iwlwifi-so-a0*
 
-%files -n libertas-sd8686-firmware
+%files -n libertas-firmware
 %license LICENCE.Marvell
 %dir %{_firmwarepath}/libertas
-%{_firmwarepath}/libertas/sd8686*
-
-%files -n libertas-sd8787-firmware
-%license LICENCE.Marvell
 %dir %{_firmwarepath}/mrvl
-%{_firmwarepath}/mrvl/sd8787*
-
-%files -n libertas-usb8388-firmware
-%license LICENCE.Marvell
-%dir %{_firmwarepath}/libertas
-%{_firmwarepath}/libertas/usb8388_v9.bin*
-
-%files -n libertas-usb8388-olpc-firmware
-%license LICENCE.Marvell
-%dir %{_firmwarepath}/libertas
+%{_firmwarepath}/libertas/sd8686*
 %{_firmwarepath}/libertas/usb8388_olpc.bin*
+%{_firmwarepath}/libertas/usb8388_v9.bin*
+%{_firmwarepath}/mrvl/sd8787*
 
 %files -n mt7xxx-firmware
 %license LICENCE.mediatek