From 536610c90ad4d1589d49f3db5e6a02460ae70c03 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@fedoraproject.org>
Date: Thu, 20 Jul 2006 13:15:15 +0000
Subject: [PATCH] new upstream

---
 .cvsignore    |  1 +
 alsa-lib.spec | 78 ++++++++-------------------------------------------
 sources       |  3 +-
 3 files changed, 13 insertions(+), 69 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 15f54ae..7cda3b3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -7,3 +7,4 @@ ainit-0.6.tar.gz
 alsa-lib-1.0.10.tar.bz2
 alsa-lib-1.0.11rc2.tar.bz2
 ainit-0.7.tar.gz
+alsa-lib-1.0.12rc1.tar.bz2
diff --git a/alsa-lib.spec b/alsa-lib.spec
index dab1fa5..2627d57 100644
--- a/alsa-lib.spec
+++ b/alsa-lib.spec
@@ -1,18 +1,14 @@
-%define prever         rc2
-%define version_main   1.0.11
-%define version_ainit  0.7
+%define prever         rc1
+%define version_main   1.0.12
 
 Summary: The Advanced Linux Sound Architecture (ALSA) library.
 Name:    alsa-lib
 Version: %{version_main}
-Release: 6.rc2
+Release: 1.rc1
 License: LGPL
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version_main}%{?prever}.tar.bz2
-Source1: ainit-%{version_ainit}.tar.gz
-Patch0:  alsa-lib-1.0.10-ainit-2.patch
-Patch1:  alsa-lib-1.0.11-group.patch
-Patch2:  alsa-lib-1.0.11-ainit-start.patch
+Patch:   alsa-lib-1.0.12rc1-config.patch
 URL:     http://www.alsa-project.org/
 BuildRoot: %{_tmppath}/%{name}-%{version_main}-root
 BuildRequires: doxygen
@@ -39,10 +35,8 @@ This package includes the ALSA development libraries for developing
 against the ALSA libraries and interfaces.
 
 %prep
-%setup -q -n %{name}-%{version_main}%{?prever} -a 1
-%patch0 -p1 -b .ainit
-%patch1 -p1 -b .group
-%patch2 -p1 -b .start
+%setup -q -n %{name}-%{version_main}%{?prever}
+%patch -p1 -b .config
 
 %build
 %configure \
@@ -52,11 +46,6 @@ against the ALSA libraries and interfaces.
 make %{?_smp_mflags}
 make doc
 
-# Compile ainit
-cd ainit
-./compile
-cd ..
-
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
@@ -69,73 +58,24 @@ 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/dmix.template %{buildroot}%{_sysconfdir}/alsa/pcm/dmix.template
-install -m 644 ainit/config/dsnoop.template %{buildroot}%{_sysconfdir}/alsa/pcm/dsnoop.template
-
-install -m 644 ainit/config/dmix.conf.lock %{buildroot}%{_sysconfdir}/alsa/pcm/dmix.conf.lock
-install -m 644 ainit/config/dsnoop.conf.lock %{buildroot}%{_sysconfdir}/alsa/pcm/dsnoop.conf.lock
-
-cp %{buildroot}%{_sysconfdir}/alsa/pcm/dmix.conf %{buildroot}%{_sysconfdir}/alsa/pcm/dmix.conf.back
-cp %{buildroot}%{_sysconfdir}/alsa/pcm/dsnoop.conf %{buildroot}%{_sysconfdir}/alsa/pcm/dsnoop.conf.back
-
-# 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/ainit.template.5 %{buildroot}%{_mandir}/man5/ainit.template.5
-
 %clean
 rm -rf %{buildroot}
 
-%post
-/sbin/ldconfig 
-
-# Upgrade - remove the current buffers
-if [ $1 = 2 ] && [ -f /var/run/console/console.lock ]; then
-   /usr/bin/ainit `cat /var/run/console/console.lock` stop
-fi
-# Create the new ones
-if [ -f /var/run/console/console.lock ]; then
-   /usr/bin/ainit `cat /var/run/console/console.lock` start
-fi
+%post -p /sbin/ldconfig 
 
 %postun -p /sbin/ldconfig
 
-%preun 
-# Only if we're removing the package
-if [ $1 = 0 ] && [ -f /var/run/console/console.lock ]; then
-   /usr/bin/ainit `cat /var/run/console/console.lock` stop
-fi
-
 %triggerpostun -- alsa-lib < 1.0.6-2
 ln -snf ../../etc/alsa %{_datadir}/alsa
 
 %files
 %defattr(-, root, root)
 %doc COPYING ChangeLog TODO doc/asoundrc.txt
-%{_bindir}/alsalisp
 %{_bindir}/aserver
 /%{_lib}/libasound.so.*
 %{_libdir}/alsa-lib/smixer/*
 %{_sysconfdir}/alsa
 %config %{_sysconfdir}/alsa/alsa.conf
-%{_bindir}/ainit
-%{_mandir}/man?/*
-%config %{_sysconfdir}/alsa/pcm/dmix.template
-%config %{_sysconfdir}/alsa/pcm/dsnoop.template
-%ghost  %{_sysconfdir}/alsa/pcm/dmix.conf.lock
-%ghost  %{_sysconfdir}/alsa/pcm/dsnoop.conf.lock
-%config %{_sysconfdir}/alsa/pcm/dmix.conf
-%config %{_sysconfdir}/alsa/pcm/dsnoop.conf
-%config %{_sysconfdir}/alsa/ainit.conf
 
 %files devel
 %defattr(-, root, root)
@@ -149,6 +89,10 @@ ln -snf ../../etc/alsa %{_datadir}/alsa
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Thu Jul 20 2006 Martin Stransky <stransky@redhat.com> 1.0.12-1.rc1
+- new upstream
+- removed ainit (no longer needed in the new upstream)
+
 * Wed Jul 19 2006 Jesse Keating <jkeating@redhat.com> - 1.0.11-6.rc2
 - fix release for upgrade path
 
diff --git a/sources b/sources
index 8b5d294..d858453 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-4e73229d7f88a6610993470011d39ee6  alsa-lib-1.0.11rc2.tar.bz2
-062cf16b02de99ddea47a76884d7fe3d  ainit-0.7.tar.gz
+8a3f6d218a9285426556fb3006054725  alsa-lib-1.0.12rc1.tar.bz2