From 6324b7149bdf41499d9fa2bf94e269c121a3f44d643994ec3e01ec014b86042b Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.com>
Date: Tue, 14 Jan 2020 14:02:24 +0000
Subject: [PATCH] Accepting request 764312 from
 home:tiwai:branches:multimedia:libs

Drop SOF again, it'll be in the individual package instead
Re-format the changelog for submission to Factory again

OBS-URL: https://build.opensuse.org/request/show/764312
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-firmware?expand=0&rev=35
---
 alsa-firmware.changes      | 19 +++++--------------
 alsa-firmware.spec         | 15 +++------------
 sof-firmware-1.4.1.tar.bz2 |  3 ---
 3 files changed, 8 insertions(+), 29 deletions(-)
 delete mode 100644 sof-firmware-1.4.1.tar.bz2

diff --git a/alsa-firmware.changes b/alsa-firmware.changes
index 3121156..233effd 100644
--- a/alsa-firmware.changes
+++ b/alsa-firmware.changes
@@ -1,21 +1,12 @@
 -------------------------------------------------------------------
-Tue Jan 14 10:43:56 CET 2020 - tiwai@suse.de
+Tue Jan 14 14:46:03 CET 2020 - tiwai@suse.de
 
-- Install license-related files into licensesdir
-- Drop the support for old distros (<1200), drop old udev rules
-
--------------------------------------------------------------------
-Tue Jan 14 09:13:44 CET 2020 - tiwai@suse.de
-
-- Remove conflicting CA0132 files against kernel-firmware
-- Add supplements for the automatic installation
-
--------------------------------------------------------------------
-Fri Jan 10 17:10:20 CET 2020 - tiwai@suse.de
-
-- Install SOF firmware binaries, too (sof-firmware-1.4.1)
 - Comment out superfluous buildreq automake
 - Run fdupes for reducing the duplications
+- Remove conflicting CA0132 files against kernel-firmware
+- Add supplements for the automatic installation
+- Install license-related files into licensesdir
+- Drop the support for old distros (<1200), drop old udev rules
 
 -------------------------------------------------------------------
 Fri Nov 15 17:42:05 CET 2019 - tiwai@suse.de
diff --git a/alsa-firmware.spec b/alsa-firmware.spec
index 2929a5e..288c1f6 100644
--- a/alsa-firmware.spec
+++ b/alsa-firmware.spec
@@ -16,13 +16,11 @@
 #
 
 
-%define sof_version 1.4.1
-
 Name:           alsa-firmware
 Url:            http://www.alsa-project.org/
 Summary:        Firmware Data Files for ALSA
 # BuildRequires:  automake
-License:        GPL-2.0-or-later AND BSD-3-Clause
+License:        GPL-2.0-or-later
 Group:          Hardware/Other
 BuildRequires:  fdupes
 %if 0%{?suse_version} > 1220
@@ -33,7 +31,6 @@ Version:        1.2.1
 Release:        0
 Source:         ftp://ftp.alsa-project.org/pub/firmware/alsa-firmware-%{version}.tar.bz2
 Source1:        usx2yaudio.rules
-Source10:       ftp://ftp.alsa-project.org/pub/misc/sof/sof-firmware-%{sof_version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 Requires:       alsa
@@ -78,7 +75,7 @@ Supplements:    modalias(pci:v000010B5d00009050sv00001369sd*bc*sc*i*)
 Various firmware data files for ALSA drivers.
 
 %prep
-%setup -q -a 10
+%setup -q
 
 %build
 # autoreconf -fi
@@ -93,10 +90,6 @@ make DESTDIR="%{buildroot}" install
 # remove duplicated entries that are already in kernel-firmware package
 rm -f %{buildroot}/lib/firmware/ctefx.bin
 rm -f %{buildroot}/lib/firmware/ctspeq.bin
-# SOF firmwares
-mkdir -p %{buildroot}/lib/firmware/intel/
-cp -a usr/lib/firmware/intel/* %{buildroot}/lib/firmware/intel/
-rm -f %{buildroot}/lib/firmware/intel/*/LICENCE
 # remove unnecessary loader firmwares
 for d in vxloader mixartloader pcxhrloader; do
   rm -rf %{buildroot}%{_datadir}/alsa/firmware/$d
@@ -142,8 +135,6 @@ for d in echoaudio hdsploader mixartloader pcxhrloader usx2yloader vxloader asih
   done
   )
 done
-mkdir %{buildroot}%{_licensedir}/%{name}/sof
-cp usr/lib/firmware/intel/sof/LICENCE %{buildroot}%{_licensedir}/%{name}/sof
 # udev rules
 install -D -c -m 0644 %{SOURCE1} %{buildroot}%{_udevdir}/rules.d/52-usx2yaudio.rules
 %fdupes -s %{buildroot}
@@ -151,7 +142,7 @@ install -D -c -m 0644 %{SOURCE1} %{buildroot}%{_udevdir}/rules.d/52-usx2yaudio.r
 %files
 %defattr(-, root, root)
 %doc %{_docdir}/%{name}
-%license  %{_licensedir}/%{name}
+%license %{_licensedir}/%{name}
 /lib/firmware/*
 %{_datadir}/alsa
 %{_udevdir}
diff --git a/sof-firmware-1.4.1.tar.bz2 b/sof-firmware-1.4.1.tar.bz2
deleted file mode 100644
index 08929fd..0000000
--- a/sof-firmware-1.4.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:096ee3fd53f030caedc9546746cb2b6070948b09b5290aafd75970ecec8f9b1b
-size 1057167