From ebba6eee887791f216ae2ccc9af7790bb5577d32 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Apr 04 2018 09:02:32 +0000
Subject: changed add-on directory to /etc/alsa/conf.d


---

diff --git a/alsa-lib-addon-dir.patch b/alsa-lib-addon-dir.patch
new file mode 100644
index 0000000..7cc32fa
--- /dev/null
+++ b/alsa-lib-addon-dir.patch
@@ -0,0 +1,85 @@
+From 93e03bdc2a3dcd5d12516f5de78e14d88a32ff2c Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Wed, 4 Apr 2018 09:58:12 +0200
+Subject: [PATCH 1/2] alsa.conf: change the location for add-on configs to
+ /etc/alsa/conf.d
+
+The add-on configuration files should be placed to a volatile place.
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ src/conf/alsa.conf | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf
+index f22918fb..bb00ff40 100644
+--- a/src/conf/alsa.conf
++++ b/src/conf/alsa.conf
+@@ -8,13 +8,7 @@
+ 	{
+ 		func load
+ 		files [
+-			{
+-				@func concat
+-				strings [
+-					{ @func datadir }
+-					"/alsa.conf.d/"
+-				]
+-			}
++			"/etc/alsa/conf.d"
+ 			"/etc/asound.conf"
+ 			"~/.asoundrc"
+ 		]
+-- 
+2.13.6
+
+
+From 78505dccd23546cc77e5221cb21c01325bc0138d Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Wed, 4 Apr 2018 10:02:49 +0200
+Subject: [PATCH 2/2] conf: remove alsa.conf.d from the datadir
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ src/conf/Makefile.am             | 2 +-
+ src/conf/alsa.conf.d/Makefile.am | 8 --------
+ src/conf/alsa.conf.d/README      | 2 --
+ 3 files changed, 1 insertion(+), 11 deletions(-)
+ delete mode 100644 src/conf/alsa.conf.d/Makefile.am
+ delete mode 100644 src/conf/alsa.conf.d/README
+
+diff --git a/src/conf/Makefile.am b/src/conf/Makefile.am
+index ef2ea9c1..2b46f95c 100644
+--- a/src/conf/Makefile.am
++++ b/src/conf/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS=cards pcm alsa.conf.d
++SUBDIRS=cards pcm
+ 
+ if BUILD_UCM
+ SUBDIRS += ucm
+diff --git a/src/conf/alsa.conf.d/Makefile.am b/src/conf/alsa.conf.d/Makefile.am
+deleted file mode 100644
+index c91661e9..00000000
+--- a/src/conf/alsa.conf.d/Makefile.am
++++ /dev/null
+@@ -1,8 +0,0 @@
+-alsaconfigdir = @ALSA_CONFIG_DIR@
+-alsadir = $(alsaconfigdir)/alsa.conf.d
+-cfg_files = README
+-
+-alsa_DATA = $(cfg_files)
+-
+-EXTRA_DIST = \
+-	$(cfg_files)
+diff --git a/src/conf/alsa.conf.d/README b/src/conf/alsa.conf.d/README
+deleted file mode 100644
+index 99978848..00000000
+--- a/src/conf/alsa.conf.d/README
++++ /dev/null
+@@ -1,2 +0,0 @@
+-You can place files named *.conf in this folder and they will be processed
+-when initialising alsa-lib.
+-- 
+2.13.6
+
diff --git a/alsa-lib.spec b/alsa-lib.spec
index 5ea7b42..5bfb86f 100644
--- a/alsa-lib.spec
+++ b/alsa-lib.spec
@@ -5,7 +5,7 @@
 Summary:  The Advanced Linux Sound Architecture (ALSA) library
 Name:     alsa-lib
 Version:  1.1.6
-Release:  1%{?prever_dot}%{?dist}
+Release:  2%{?prever_dot}%{?dist}
 License:  LGPLv2+
 Group:    System Environment/Libraries
 URL:      http://www.alsa-project.org/
@@ -16,6 +16,7 @@ Source11: modprobe-dist-alsa.conf
 Source12: modprobe-dist-oss.conf
 Patch0:   alsa-lib-1.0.24-config.patch
 Patch1:   alsa-lib-1.0.14-glibc-open.patch
+Patch10:  alsa-lib-addon-dir.patch
 
 BuildRequires:  doxygen
 BuildRequires:  autoconf automake libtool
@@ -55,6 +56,7 @@ Manager allows configuration of Audio input/output names and routing
 %setup -q -n %{name}-%{version}%{?prever}%{?postver}
 %patch0 -p1 -b .config
 %patch1 -p1 -b .glibc-open
+%patch10 -p1 -b .addon-dir
 
 %build
 autoreconf -vif
@@ -119,6 +121,9 @@ find %{buildroot} -name '*.la' -delete
 %{_datadir}/alsa/ucm
 
 %changelog
+* Wed Apr 04 2018 Jaroslav Kysela <perex@perex.cz> - 1.1.6-2
+- Changed add-on directory to /etc/alsa/conf.d
+
 * Tue Apr 03 2018 Jaroslav Kysela <perex@perex.cz> - 1.1.6-1
 - Updated to 1.1.6