From a9bdf9196cd5b5723841c8e11081e2615768e055 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Thu, 26 May 2022 11:18:16 +0100
Subject: [PATCH] Order firmware sub packages alphabetically

---
 linux-firmware.spec | 72 ++++++++++++++++++++++-----------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/linux-firmware.spec b/linux-firmware.spec
index eec2849..05e4a5e 100644
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -227,6 +227,20 @@ This package contains the firmware required by the Intel wireless drivers
 for Linux.  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
+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
@@ -243,20 +257,6 @@ Requires:	linux-firmware-whence
 Firmware for Marvell Libertas USB 8388 Network Adapter with OLPC mesh network
 support.
 
-%package -n libertas-sd8686-firmware
-Summary:	Firmware for Marvell Libertas SD 8686 Network Adapter
-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 liquidio-firmware
 Summary:	Firmware for Cavium LiquidIO Intelligent Server Adapter
 License:	Redistributable, no modification permitted
@@ -264,13 +264,6 @@ Requires:	linux-firmware-whence
 %description -n liquidio-firmware
 Firmware for Cavium LiquidIO Intelligent Server Adapter
 
-%package -n netronome-firmware
-Summary:	Firmware for Netronome Smart NICs
-License:	Redistributable, no modification permitted
-Requires:	linux-firmware-whence
-%description -n netronome-firmware
-Firmware for Netronome Smart NICs
-
 %package -n mrvlprestera-firmware
 Summary:	Firmware for Marvell Prestera Switchdev/ASIC devices
 License:	Redistributable, no modification permitted
@@ -278,6 +271,13 @@ Requires:	linux-firmware-whence
 %description -n mrvlprestera-firmware
 Firmware for Marvell Prestera Switchdev/ASIC devices
 
+%package -n netronome-firmware
+Summary:	Firmware for Netronome Smart NICs
+License:	Redistributable, no modification permitted
+Requires:	linux-firmware-whence
+%description -n netronome-firmware
+Firmware for Netronome Smart NICs
+
 %prep
 %autosetup -p1
 
@@ -429,16 +429,6 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
 %{_firmwarepath}/iwlwifi-ty-a0*
 %{_firmwarepath}/iwlwifi-so-a0*
 
-%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/usb8388_olpc.bin*
-
 %files -n libertas-sd8686-firmware
 %license LICENCE.Marvell
 %dir %{_firmwarepath}/libertas
@@ -449,21 +439,31 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
 %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/usb8388_olpc.bin*
+
 %files -n liquidio-firmware
 %license LICENCE.cavium_liquidio
 %dir %{_firmwarepath}/liquidio
 %{_firmwarepath}/liquidio/*
 
-%files -n netronome-firmware
-%license LICENCE.Netronome
-%dir %{_firmwarepath}/netronome
-%{_firmwarepath}/netronome/*
-
 %files -n mrvlprestera-firmware
 %license LICENCE.Marvell
 %dir %{_firmwarepath}/mrvl/prestera
 %{_firmwarepath}/mrvl/prestera/*
 
+%files -n netronome-firmware
+%license LICENCE.Netronome
+%dir %{_firmwarepath}/netronome
+%{_firmwarepath}/netronome/*
+
 %changelog
 * Mon May  9 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 20220509-132
 - Update to upstream 20220509 release