From d0a435fe6d6d779b06d3731a71bf49cfa23189d8 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@fedoraproject.org>
Date: Apr 27 2005 12:41:25 +0000
Subject: - updated to 1.0.9rc2

- add ainit tool
- dmix is now default pcm device

---

diff --git a/.cvsignore b/.cvsignore
index 4af9a91..bff794f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,4 @@
 alsa-lib-1.0.7.tar.bz2
 alsa-lib-1.0.8.tar.bz2
+alsa-lib-1.0.9rc2.tar.bz2
+ainit-0.2.tar.gz
diff --git a/alsa-lib.spec b/alsa-lib.spec
index 02dc20d..7e12e22 100644
--- a/alsa-lib.spec
+++ b/alsa-lib.spec
@@ -1,15 +1,15 @@
 Summary: The Advanced Linux Sound Architecture (ALSA) library.
 Name: alsa-lib
-Version: 1.0.8
-Release: 4.devel
+Version: 1.0.9rc2
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}.tar.bz2
-Patch2: alsa-lib-macro.patch
-#Patch3: alsa-lib-1.0.7-asym-config.patch
-Patch4: alsa-lib-stack2.patch
-Patch5: alsa-lib-alpha.patch
-Patch6: alsa-lib-gcc4.patch
+Source1: ainit-0.2.tar.gz
+Patch0: alsa-lib-mixer.patch
+Patch1: alsa-lib-alpha.patch
+Patch2: alsa-lib-gcc4.patch
+Patch3: alsa-lib-ainit.patch
 URL: http://www.alsa-project.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: doxygen
@@ -36,12 +36,11 @@ This package includes the ALSA development libraries for developing
 against the ALSA libraries and interfaces.
 
 %prep
-%setup -q -n %{name}-%{version}%{?prever}
-%patch2 -p1 -b .macro
-#%patch3 -p1 -b .load-env
-%patch4 -p1
-%patch5 -p1 -b .alpha
-%patch6 -p1 -b .old
+%setup -q -n %{name}-%{version}%{?prever} -a 1
+%patch0 -p1 -b .mixer
+%patch1 -p1 -b .alpha
+%patch2 -p1 -b .gcc4
+%patch3 -p1 -b .ainit
 
 %build
 %configure \
@@ -51,6 +50,10 @@ against the ALSA libraries and interfaces.
 make %{?_smp_mflags}
 make doc
 
+cd ainit
+./compile
+cd ..
+
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
@@ -61,9 +64,23 @@ mkdir -p %{buildroot}/%{_lib}
 mv %{buildroot}%{_libdir}/libasound.so.* %{buildroot}/%{_lib}
 ln -snf ../../%{_lib}/libasound.so.2 %{buildroot}%{_libdir}/libasound.so
 
-
 mv %{buildroot}/etc/aclocal %{buildroot}%{_datadir}
 
+# install ainit binaries
+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 ainit man pages
+mkdir -p %{buildroot}%{_mandir}/man8
+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
+
 %clean
 rm -rf %{buildroot}
 
@@ -82,6 +99,8 @@ ln -snf ../../etc/alsa %{_datadir}/alsa
 /%{_lib}/libasound.so.*
 %{_sysconfdir}/alsa
 %config %{_sysconfdir}/alsa/alsa.conf
+%{_bindir}/ainit
+%{_mandir}/man?/*
 
 %files devel
 %defattr(-, root, root)
@@ -95,6 +114,11 @@ ln -snf ../../etc/alsa %{_datadir}/alsa
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Fri Apr 22 2005 Martin Stransky <stransky@redhat.com> 1.0.9rc2-1
+- updated to 1.0.9rc2
+- add ainit tool 
+- dmix is now default pcm device
+
 * Mon Mar  7 2005 Martin Stransky <stransky@redhat.com> 1.0.8-4.devel
 - gcc4 patch
 
diff --git a/sources b/sources
index 0da19d0..8a61a54 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-c677299ed39d069c9a4b6a999e34ffe7  alsa-lib-1.0.8.tar.bz2
+0b606956d9c02e568be36a7f6ca15511  alsa-lib-1.0.9rc2.tar.bz2
+9bdd3c747ee2f95750661c07bc55d9a2  ainit-0.2.tar.gz