From df1ce312c51ea58e2733db4f9bdcb91c7015b732 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 13 Nov 2019 16:14:16 +0100
Subject: [PATCH] updated to 1.2.1

---
 .gitignore    |  2 ++
 alsa-lib.spec | 33 ++++++++++++++++++++++++++++-----
 sources       |  4 +++-
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index f2c97a9..164c3cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 /alsa-lib-1.*.tar.bz2
+/alsa-topology-conf-1.2.1.tar.bz2
+/alsa-ucm-conf-1.2.1.tar.bz2
diff --git a/alsa-lib.spec b/alsa-lib.spec
index 4cf36ea..4900974 100644
--- a/alsa-lib.spec
+++ b/alsa-lib.spec
@@ -2,14 +2,20 @@
 #define  prever_dot .rc3
 #define  postver    a
 
+%define version_alsa_lib  1.2.1
+%define version_alsa_ucm  1.2.1
+%define version_alsa_tplg 1.2.1
+
 Summary:  The Advanced Linux Sound Architecture (ALSA) library
 Name:     alsa-lib
-Version:  1.1.9
-Release:  2%{?prever_dot}%{?dist}
+Version:  %{version_alsa_lib}
+Release:  1%{?prever_dot}%{?dist}
 License:  LGPLv2+
 URL:      http://www.alsa-project.org/
 
 Source:   ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2
+Source1:  ftp://ftp.alsa-project.org/pub/lib/alsa-ucm-conf-%{version_alsa_ucm}.tar.bz2
+Source2:  ftp://ftp.alsa-project.org/pub/lib/alsa-topology-conf-%{version_alsa_tplg}.tar.bz2
 Source10: asound.conf
 Source11: modprobe-dist-alsa.conf
 Source12: modprobe-dist-oss.conf
@@ -43,7 +49,7 @@ against the ALSA libraries and interfaces.
 %package  -n alsa-ucm
 Summary:   ALSA Use Case Manager configuration
 BuildArch: noarch
-Requires:  %{name} = %{version}-%{release}
+Requires:  %{name} >= %{version_alsa_ucm}
 
 %description -n alsa-ucm
 The Advanced Linux Sound Architecture (ALSA) Use Case Manager configuration
@@ -52,7 +58,7 @@ contains alsa-lib configuration of Audio input/output names and routing
 %package  -n alsa-topology
 Summary:   ALSA Topology configuration
 BuildArch: noarch
-Requires:  %{name} = %{version}-%{release}
+Requires:  %{name} >= %{version_alsa_tplg}
 
 %description -n alsa-topology
 The Advanced Linux Sound Architecture (ALSA) topology configuration
@@ -84,6 +90,8 @@ make DESTDIR=%{buildroot} install
 mkdir -p %{buildroot}/%{_lib}
 mv %{buildroot}%{_libdir}/libasound.so.* %{buildroot}/%{_lib}
 ln -snf ../../%{_lib}/libasound.so.2 %{buildroot}%{_libdir}/libasound.so
+mv %{buildroot}%{_libdir}/libatopology.so.* %{buildroot}/%{_lib}
+ln -snf ../../%{_lib}/libatopology.so.2 %{buildroot}%{_libdir}/libatopology.so
 
 # Install global configuration files
 mkdir -p -m 755 %{buildroot}/etc
@@ -95,12 +103,19 @@ install -p -m 644 %{SOURCE11} %{buildroot}%{sysmodprobedir}/dist-alsa.conf
 # bug#926973, place this file to the doc directory
 install -p -m 644 %{SOURCE12} .
 
-# Create UCM directory
+# Create UCM directories
 mkdir -p %{buildroot}/%{_datadir}/alsa/ucm
+mkdir -p %{buildroot}/%{_datadir}/alsa/ucm2
+
+# Unpack UCMs
+tar xvJf %{SOURCE1} -C %{buildroot}/%{_datadir}/alsa ucm ucm2
 
 # Create topology directory
 mkdir -p %{buildroot}/%{_datadir}/alsa/topology
 
+# Unpack topologies
+tar xvJf %{SOURCE2} -C %{buildroot}/%{_datadir}/alsa topology
+
 # Remove libtool archives.
 find %{buildroot} -name '*.la' -delete
 
@@ -115,10 +130,12 @@ rm %{buildroot}/%{_includedir}/asoundlib.h
 %doc doc/asoundrc.txt modprobe-dist-oss.conf
 %config %{_sysconfdir}/asound.conf
 /%{_lib}/libasound.so.*
+/%{_lib}/libatopology.so.*
 %{_bindir}/aserver
 #{_libdir}/alsa-lib/
 %{_datadir}/alsa/
 %exclude %{_datadir}/alsa/ucm
+%exclude %{_datadir}/alsa/ucm2
 %exclude %{_datadir}/alsa/topology
 %{sysmodprobedir}/dist-*
 
@@ -127,16 +144,22 @@ rm %{buildroot}/%{_includedir}/asoundlib.h
 %{_includedir}/alsa/
 %{_includedir}/sys/asoundlib.h
 %{_libdir}/libasound.so
+%{_libdir}/libatopology.so
 %{_libdir}/pkgconfig/alsa.pc
+%{_libdir}/pkgconfig/alsa-topology.pc
 %{_datadir}/aclocal/alsa.m4
 
 %files -n alsa-ucm
 %{_datadir}/alsa/ucm
+%{_datadir}/alsa/ucm2
 
 %files -n alsa-topology
 %{_datadir}/alsa/topology
 
 %changelog
+* Wed Nov 13 2019 Jaroslav Kysela <perex@perex.cz> - 1.2.1-1
+- Updated to 1.2.1
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index d98b561..05c95a3 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
-SHA512 (alsa-lib-1.1.9.tar.bz2) = 402e39cca82d17555e3e52ef06b8ed9dcf58531da393809a7b5cf18658299fa90ee8a60bfc5213482d7a02b13140c441f1333b144556f44ab4adb786a2fb3c49
+SHA512 (alsa-lib-1.2.1.tar.bz2) = 3bc0eef8eb0e16a521781ee4303df7b9c313432f174625fa77d54ed1650ced74efa47e215d26f94af36a1a275bb9975a9c51a51983b5303de1b19bf562bc1dd9
+SHA512 (alsa-ucm-conf-1.2.1.tar.bz2) = f86b94f8b5309f06a4aa9aecdd586cd69c618eedae7914857cf2ee4292fe1ce826781da636e53a0a8206ac78315e6b248cba8111f1647ca075ea60224b41efd9
+SHA512 (alsa-topology-conf-1.2.1.tar.bz2) = 2a17493ba563ee45362e4d2e63fd432d63aed0c817cb42d204d64924f12451d7a03dfa947edf4eb1b644c42c93e15c5d4d4e19d8b942db6a847cfd104ba4ec73