From 67cde2fdbcd25b191514bce48c1a7a1c89f045fd Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@fedoraproject.org>
Date: May 18 2005 13:07:49 +0000
Subject: fix for #130593


---

diff --git a/.cvsignore b/.cvsignore
index 00cd0fb..82cb620 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,3 +3,4 @@ alsa-lib-1.0.8.tar.bz2
 alsa-lib-1.0.9rc2.tar.bz2
 ainit-0.2.tar.gz
 ainit-0.3.tar.gz
+ainit-0.4.tar.gz
diff --git a/alsa-lib.spec b/alsa-lib.spec
index c17ae9e..881b61f 100644
--- a/alsa-lib.spec
+++ b/alsa-lib.spec
@@ -1,17 +1,19 @@
 Summary: The Advanced Linux Sound Architecture (ALSA) library.
 Name: alsa-lib
 Version: 1.0.9rc2
-Release: 4
+Release: 5
 License: LGPL
 Group: System Environment/Libraries
 Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}.tar.bz2
-Source1: ainit-0.3.tar.gz
-Patch0: alsa-lib-mixer.patch
+Source1: ainit-0.4.tar.gz
+#Patch0: alsa-lib-mixer.patch
 Patch1: alsa-lib-alpha.patch
 Patch2: alsa-lib-gcc4.patch
 Patch3: alsa-lib-ainit.patch
 Patch4: alsa-lib-1.0.9rc2-cvs.patch
-Patch5: alsa-lib-1.0.9rc2-ainit-config.patch
+#Patch5: alsa-lib-1.0.9rc2-ainit-config.patch
+Patch6: alsa-lib-ainit-dsnoop.patch
+Patch7: alsa-lib-1.0.9rc3-mixer-gentoo.patch
 URL: http://www.alsa-project.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: doxygen
@@ -39,12 +41,14 @@ against the ALSA libraries and interfaces.
 
 %prep
 %setup -q -n %{name}-%{version}%{?prever} -a 1
-%patch0 -p1 -b .mixer
+#%patch0 -p1 -b .mixer
 %patch1 -p1 -b .alpha
 %patch2 -p1 -b .gcc4
 %patch3 -p1 -b .ainit
 %patch4 -p1 -b .arts
-%patch5 -p1 -b .ainit
+#%patch5 -p1 -b .ainit
+%patch6 -p1
+%patch7 -p1 -b .mixer
 
 %build
 %configure \
@@ -75,7 +79,8 @@ install -m 755 ainit/ainit %{buildroot}%{_bindir}
 
 # install ainit config files
 install -m 644 ainit/config/ainit.conf %{buildroot}%{_sysconfdir}/alsa/ainit.conf
-install -m 644 ainit/config/asoundrc.template %{buildroot}%{_sysconfdir}/alsa/asoundrc.template
+install -m 644 ainit/config/dmix.template %{buildroot}%{_sysconfdir}/alsa/pcm/dmix.template
+install -m 644 ainit/config/dsnoop.template %{buildroot}%{_sysconfdir}/alsa/pcm/dsnoop.template
 
 # install ainit man pages
 mkdir -p %{buildroot}%{_mandir}/man8
@@ -83,7 +88,7 @@ install -m 644 ainit/doc/ainit.8 %{buildroot}%{_mandir}/man8/ainit.8
 
 mkdir -p %{buildroot}%{_mandir}/man5
 install -m 644 ainit/doc/ainit.conf.5 %{buildroot}%{_mandir}/man5/ainit.conf.5
-install -m 644 ainit/doc/asoundrc.template.5 %{buildroot}%{_mandir}/man5/asoundrc.template.5
+install -m 644 ainit/doc/ainit.template.5 %{buildroot}%{_mandir}/man5/ainit.template.5
 
 %clean
 rm -rf %{buildroot}
@@ -118,6 +123,12 @@ ln -snf ../../etc/alsa %{_datadir}/alsa
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Wed May 18 2005 Martin Stransky <stransky@redhat.com> 1.0.9rc2-5
+- fix for #130593
+- new ainit (dmix/dsnoop is default only for cards which really need it)
+- fix dsnoop
+- add fix for mixer (from https://bugs.gentoo.org/attachment.cgi?id=58918)
+
 * Wed May 04 2005 Than Ngo <than@redhat.com> 1.0.9rc2-4
 - apply patch to fix artsd daemon crash #156592
 
diff --git a/sources b/sources
index 2b0e17d..16bd6f8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 0b606956d9c02e568be36a7f6ca15511  alsa-lib-1.0.9rc2.tar.bz2
-39f98d74d7cd65ae7695cc80e2e2b0e8  ainit-0.3.tar.gz
+509cdf0740cd41297c7b568182974a46  ainit-0.4.tar.gz