From 893a736d6fe24ee27f26372873572c865aea61e6 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 20:20:34 +0100
Subject: [PATCH] moved to -extras files conflicting with current
 linux-firmware package [release 1.0.29-2mamba;Thu Jul 25 2019]

---
 alsa-firmware.spec | 49 +++++++++++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/alsa-firmware.spec b/alsa-firmware.spec
index 89b946c..34a044d 100644
--- a/alsa-firmware.spec
+++ b/alsa-firmware.spec
@@ -1,7 +1,7 @@
 Name:          alsa-firmware
 Version:       1.0.29
-Release:       1mamba
-Summary:       firmware for several ALSA-supported sound cards
+Release:       2mamba
+Summary:       Firmware files for several ALSA-supported sound cards
 Group:         System/Kernel and Hardware
 Vendor:        openmamba
 Distribution:  openmamba
@@ -21,6 +21,14 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 This package contains the firmware binaries for a number of sound cards.
 Some (but not all of these) require firmware loaders which are included in the alsa-tools-firmware package.
 
+%package extras
+Group:         System/Kernel and Hardware
+Summary:       Extra firmware files for several ALSA-supported sound cards
+
+%description extras
+This package contains the firmware binaries for a number of sound cards.
+Some (but not all of these) require firmware loaders which are included in the alsa-tools-firmware package.
+
 %prep
 %setup -q
 # broken symlinks in the output RPM, with no sign of the actual firmware (*.bin) files
@@ -68,8 +76,6 @@ done
 %dir /lib/firmware/cs46xx
 /lib/firmware/cs46xx/*
 #
-/lib/firmware/ctefx.bin
-/lib/firmware/ctspeq.bin
 # License: GPL (undefined version)
 /lib/firmware/digiface_*.bin
 # The licenses for the Echo Audio firmware vary slightly so each is enumerated
@@ -100,12 +106,6 @@ done
 /lib/firmware/emu/hana.fw
 /lib/firmware/emu/micro_dock.fw
 # GPL
-%dir /lib/firmware/ess
-/lib/firmware/ess/maestro3_assp_*.fw
-# GPL
-%dir /lib/firmware/korg
-/lib/firmware/korg/k1212.dsp
-# GPL
 %dir /lib/firmware/mixart
 /lib/firmware/mixart/miXart8.elf
 /lib/firmware/mixart/miXart8*.xlx
@@ -116,19 +116,11 @@ done
 # unchecked
 /lib/firmware/rpm_firmware.bin
 # GPL
-%dir /lib/firmware/sb16
-/lib/firmware/sb16/*.csp
-# GPL
 %dir /lib/firmware/vx
 /lib/firmware/vx/*.boot
 /lib/firmware/vx/*.b56
 /lib/firmware/vx/*.d56
 /lib/firmware/vx/*.xlx
-# License: No explicit license  see ALSA bug #3412
-%dir /lib/firmware/yamaha
-/lib/firmware/yamaha/*.fw
-/lib/firmware/yamaha/yss225_registers.bin
-
 # Even with --disable-loader, we still get usxxx firmware here; looking at the
 # alsa-tools-firmware package, it seems like these devices probably use an old- 
 # style hotplug loading method
@@ -141,7 +133,28 @@ done
 %{_datadir}/alsa/firmware/usx2yloader/*.ihx
 %doc COPYING README.*
 
+%files extras
+%defattr(-,root,root)
+/lib/firmware/ctefx.bin
+/lib/firmware/ctspeq.bin
+# GPL
+%dir /lib/firmware/ess
+/lib/firmware/ess/maestro3_assp_*.fw
+# GPL
+%dir /lib/firmware/korg
+/lib/firmware/korg/k1212.dsp
+# GPL
+%dir /lib/firmware/sb16
+/lib/firmware/sb16/*.csp
+# License: No explicit license  see ALSA bug #3412
+%dir /lib/firmware/yamaha
+/lib/firmware/yamaha/*.fw
+/lib/firmware/yamaha/yss225_registers.bin
+
 %changelog
+* Thu Jul 25 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 1.0.29-2mamba
+- moved to -extras files conflicting with current linux-firmware package
+
 * Mon Mar 09 2015 Automatic Build System <autodist@mambasoft.it> 1.0.29-1mamba
 - automatic version update by autodist