From e0d5f8c2ec290e16ec4a22030ab096dd3c83cb2f Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 20:20:56 +0100
Subject: [PATCH] don't package prebuilt binary tools [release
 2023.09.1-2mamba;Sat Nov 11 2023]

---
 alsa-sof-firmware.spec | 63 +++++++++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 29 deletions(-)

diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec
index 52e2566..33e4b4a 100644
--- a/alsa-sof-firmware.spec
+++ b/alsa-sof-firmware.spec
@@ -1,14 +1,14 @@
 #%global sof_commit 72a04d57d04c2df6e9dbf4eba0a98f40c252ee0b
 Name:          alsa-sof-firmware
-Version:       2.2.6
-Release:       1mamba
+Version:       2023.09.1
+Release:       2mamba
 Summary:       Firmware and topology files for Sound Open Firmware project
 Group:         System/Kernel and Hardware
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://github.com/thesofproject/sof-bin
-Source:        https://github.com/thesofproject/sof-bin/releases/download/v%{version}/sof-bin-v%{version}.tar.gz
+Source:        https://github.com/thesofproject/sof-bin/releases/download/v%{version}/sof-bin-%{version}.tar.gz
 #Source:        https://github.com/thesofproject/sof-bin.git/v%{version}/sof-bin-%{version}.tar.bz2
 #Source1:       https://github.com/thesofproject/sof.git/v%{version}/sof-%{version}.tar.bz2
 License:       BSD
@@ -19,41 +19,29 @@ License:       BSD
 Firmware and topology files for Sound Open Firmware project.
 
 %package debug
-Requires:       alsa-sof-firmware
+Requires:       alsa-sof-firmware = %{?epoch:%epoch:}%{version}-%{release}
 Summary:        Debug files for Sound Open Firmware project
-License:        BSD
 
 %description debug
 This package contains the debug files for the Sound Open Firmware project.
- 
-%prep
-%setup -q -n sof-bin-v%{version}
-	
-mkdir -p firmware/intel/sof
 
-# we have the version in the package name	
-mv sof-v%{version}/* firmware/intel/sof
- 
-# move topology files	
-mv sof-tplg-v%{version} firmware/intel/sof-tplg
-	
-# remove NXP firmware files
-rm LICENCE.NXP
-rm -rf firmware/intel/sof-tplg/sof-imx8*
+#%package tools
+#Requires:       alsa-sof-firmware = %{?epoch:%epoch:}%{version}-%{release}
+#Summary:        Tools provided with the Sound Open Firmware project
+#
+#%description tools
+#This package contains the tools provided with the Sound Open Firmware project.
+
+%prep
+%setup -q -n sof-bin-%{version}
 
 %build
-#%ifarch x86_64 aarch64
-#cd firmware/intel/sof/tools
-#% cmake -d build
-#
-#% make
-#%endif
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
-install -d -m0755 %{buildroot}/usr/lib/firmware
-cp -ra firmware/* %{buildroot}/usr/lib/firmware/
+install -d -m0755 %{buildroot}/usr/lib/firmware/intel
+cp -ar sof* %{buildroot}/usr/lib/firmware/intel/
 
 FILEDIR=$(pwd)
 pushd %{buildroot}/usr/lib/firmware
@@ -68,6 +56,9 @@ sed -i -e 's!^!/usr/lib/firmware/!' alsa-sof-firmware.{files,debug-files,dirs}
 sed -e 's/^/%%dir /' alsa-sof-firmware.dirs >> alsa-sof-firmware.files
 cat alsa-sof-firmware.files
 
+#install -d -m0755 %{buildroot}%{_bindir}
+#cp -a tools/* %{buildroot}%{_bindir}/
+
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
@@ -82,11 +73,25 @@ end
 %defattr(-,root,root)
 %dir /usr/lib/firmware/intel/sof-tplg
 /usr/lib/firmware/intel/sof-tplg/*
-%doc LICENCE.Intel
-	
+%dir /usr/lib/firmware/intel/sof-ace-tplg
+/usr/lib/firmware/intel/sof-ace-tplg/*
+%doc LICENCE.*
+
+#%files tools
+#%defattr(-,root,root)
+#%{_bindir}/mtrace-reader.py
+#%{_bindir}/sof-*
+
 %files debug -f alsa-sof-firmware.debug-files
+%defattr(-,root,root)
 
 %changelog
+* Sat Nov 11 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 2023.09.1-2mamba
+- don't package prebuilt binary tools
+
+* Sun Nov 05 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 2023.09.1-1mamba
+- update to 2023.09.1
+
 * Sat Aug 12 2023 Automatic Build System <autodist@mambasoft.it> 2.2.6-1mamba
 - automatic version update by autodist