$ git diff --patch-with-stat --summary e3a4b47eaadd1bf2abdec26970152bd059135e30..6d1dc2a6f23cd2cd00a6aeeb061553c8f5b8a23f
.abf.yml | 2 +-
sof-bin.spec | 43 +++++++++++++++++++++++++++++++++++++++++++
sof-firmware.spec | 34 ----------------------------------
3 files changed, 44 insertions(+), 35 deletions(-)
create mode 100644 sof-bin.spec
delete mode 100644 sof-firmware.spec
diff --git a/.abf.yml b/.abf.yml
index 37ca02e..fef0cac 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- sof-bin-v2.2.2.tar.gz: 20839db6405e6300f2b41082fdfea4a16bbfcb10
+ sof-bin-2024.03.tar.gz: 722132a6ed893d7e3d22260cb3b86377e456e906
diff --git a/sof-bin.spec b/sof-bin.spec
new file mode 100644
index 0000000..d2b7e6a
--- /dev/null
+++ b/sof-bin.spec
@@ -0,0 +1,43 @@
+%undefine _debugsource_packages
+%global _firmwaredir %{_prefix}/lib/firmware
+
+Name: sof-bin
+Summary: Files for working with SOF firmware
+License: BSD-3-Clause
+Group: Hardware/Other
+Version: 2024.03
+Release: 1
+URL: https://github.com/thesofproject/sof-bin
+Source: https://github.com/thesofproject/sof-bin/releases/download/v%{version}/sof-bin-%{version}.tar.gz
+BuildRequires: fdupes
+BuildRequires: rsync
+Requires: sof-firmware = %{EVRD}
+
+%description
+Files for working with SOF firmware
+
+%package -n sof-firmware
+Summary: Various firmware data files for SOF drivers.
+Group: Hardware/Other
+BuildArch: noarch
+
+%description -n sof-firmware
+Various firmware data files for SOF drivers.
+
+%prep
+%autosetup -p1 -n sof-bin-%{version}
+
+%build
+
+%install
+mkdir -p "%{buildroot}%{_firmwaredir}/intel" "%{buildroot}%{_bindir}"
+FW_DEST="%{buildroot}%{_firmwaredir}/intel" TOOLS_DEST="%{buildroot}%{_bindir}" ./install.sh
+%fdupes -s %{buildroot}
+
+%files
+%license LICENCE.*
+%doc README.*
+%{_bindir}/*
+
+%files -n sof-firmware
+%{_firmwaredir}/*
diff --git a/sof-firmware.spec b/sof-firmware.spec
deleted file mode 100644
index e86e255..0000000
--- a/sof-firmware.spec
+++ /dev/null
@@ -1,34 +0,0 @@
-%global _firmwaredir %{_prefix}/lib/firmware
-
-Name: sof-firmware
-Summary: Firmware Data Files for SOF Drivers
-License: BSD-3-Clause
-Group: Hardware/Other
-Version: 2.2.2
-Release: 1
-URL: https://github.com/thesofproject/sof-bin
-Source: https://github.com/thesofproject/sof-bin/releases/download/v%{version}/sof-bin-v%{version}.tar.gz
-BuildArch: noarch
-
-BuildRequires: fdupes
-
-%description
-Various firmware data files for SOF drivers.
-
-%prep
-%setup -q -n sof-bin-v%{version}
-
-%build
-
-%install
-mkdir -p %{buildroot}%{_firmwaredir}/intel
-# due to the upgrade problem, we can't make sof-v* -> sof symlink
-cp -a sof-v%{version} %{buildroot}%{_firmwaredir}/intel/sof
-cp -a sof-tplg-v%{version} %{buildroot}%{_firmwaredir}/intel/
-ln -s sof-tplg-v%{version} %{buildroot}%{_firmwaredir}/intel/sof-tplg
-%fdupes -s %{buildroot}
-
-%files
-%license LICENCE.*
-%doc README.*
-%{_firmwaredir}/*