From b813769b6134bf75591ba7fae2484315dba636a3f454af341a8fc098a2c68509 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.com>
Date: Mon, 18 Nov 2019 10:22:04 +0000
Subject: [PATCH] Accepting request 749247 from
 home:tiwai:branches:multimedia:libs

- Update to alsa-firmare 1.2.1:
  * Change FSF address (Franklin Street)
  * Fix up aica firmware licensing
  * Add new firmware for Creative CA0132 HD-Audio Codec

OBS-URL: https://build.opensuse.org/request/show/749247
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-firmware?expand=0&rev=30
---
 .gitattributes               |  3 ---
 alsa-firmware-1.0.29.tar.bz2 |  3 ---
 alsa-firmware-1.2.1.tar.bz2  |  3 +++
 alsa-firmware.changes        |  8 ++++++++
 alsa-firmware.spec           | 17 ++++++-----------
 ctefx-desktop.bin            |  3 ---
 ctefx-r3di.bin               |  3 ---
 7 files changed, 17 insertions(+), 23 deletions(-)
 delete mode 100644 alsa-firmware-1.0.29.tar.bz2
 create mode 100644 alsa-firmware-1.2.1.tar.bz2
 delete mode 100644 ctefx-desktop.bin
 delete mode 100644 ctefx-r3di.bin

diff --git a/.gitattributes b/.gitattributes
index 89af4ad..9b03811 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -21,6 +21,3 @@
 *.xz filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
-## Specific LFS patterns
-ctefx-desktop.bin filter=lfs diff=lfs merge=lfs -text
-ctefx-r3di.bin filter=lfs diff=lfs merge=lfs -text
diff --git a/alsa-firmware-1.0.29.tar.bz2 b/alsa-firmware-1.0.29.tar.bz2
deleted file mode 100644
index 1cc8f6f..0000000
--- a/alsa-firmware-1.0.29.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3c5ef17959e58831504d3a25e76d0a428bd9c52ebd330e06b07232ab8af4cc3d
-size 4996942
diff --git a/alsa-firmware-1.2.1.tar.bz2 b/alsa-firmware-1.2.1.tar.bz2
new file mode 100644
index 0000000..25123a6
--- /dev/null
+++ b/alsa-firmware-1.2.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aea27c571dbe02ede298cf9f637d8dfdb758e032e372c8d7e96ccb2b15fa08ab
+size 5146513
diff --git a/alsa-firmware.changes b/alsa-firmware.changes
index 3145a08..75ff869 100644
--- a/alsa-firmware.changes
+++ b/alsa-firmware.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Nov 15 17:42:05 CET 2019 - tiwai@suse.de
+
+- Update to alsa-firmare 1.2.1:
+  * Change FSF address (Franklin Street)
+  * Fix up aica firmware licensing
+  * Add new firmware for Creative CA0132 HD-Audio Codec 
+
 -------------------------------------------------------------------
 Tue May 28 19:57:17 CEST 2019 - tiwai@suse.de
 
diff --git a/alsa-firmware.spec b/alsa-firmware.spec
index 265f8ac..84199c6 100644
--- a/alsa-firmware.spec
+++ b/alsa-firmware.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package alsa-firmware
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,28 +12,25 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:           alsa-firmware
-%define package_version	1.0.29
 Url:            http://www.alsa-project.org/
 Summary:        Firmware Data Files for ALSA
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Hardware/Other
 BuildRequires:  automake
 %if 0%{?suse_version} > 1220
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(udev)
 %endif
-Version:        1.0.29
+Version:        1.2.1
 Release:        0
-Source:         ftp://ftp.alsa-project.org/pub/firmware/alsa-firmware-%{package_version}.tar.bz2
+Source:         ftp://ftp.alsa-project.org/pub/firmware/alsa-firmware-%{version}.tar.bz2
 Source1:        usx2yaudio.rules
 Source2:        usx2yaudio-old.rules
-Source3:        ctefx-desktop.bin
-Source4:        ctefx-r3di.bin
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 Requires:       alsa
@@ -47,7 +44,7 @@ Requires:       alsa
 Various firmware data files for ALSA drivers.
 
 %prep
-%setup -q -n %{name}-%{package_version}
+%setup -q
 
 %build
 # autoreconf -fi
@@ -69,8 +66,6 @@ for d in ess korg sb16 yamaha; do
   rm -rf $RPM_BUILD_ROOT/lib/firmware/$d
 done
 %endif
-install -c -m 0644 %{SOURCE3} %{buildroot}/lib/firmware/
-install -c -m 0644 %{SOURCE4} %{buildroot}/lib/firmware/
 # change identical files to symlinks for hdsploader
 pushd $RPM_BUILD_ROOT%{_datadir}/alsa/firmware/hdsploader
 for i in *.bin; do
diff --git a/ctefx-desktop.bin b/ctefx-desktop.bin
deleted file mode 100644
index 90c8434..0000000
--- a/ctefx-desktop.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c9ab092e5717080bcd90971d44aa7d8d30778058ea691dda76320cd315dcc18e
-size 655856
diff --git a/ctefx-r3di.bin b/ctefx-r3di.bin
deleted file mode 100644
index 1c875e2..0000000
--- a/ctefx-r3di.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:324b44968afd5a232651f5e040e41c12ebd120cd768c9559a4a7b7a5c823f7dc
-size 655816