From a2011e972fd83395a2b7cdb77b99a422a91eb54264021eec61b67a61b759554f Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Wed, 30 Mar 2011 07:20:23 +0000
Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/alsa revision
 100.0

OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=a8aaffc403d7ac60054f0a7711e6d8e9
---
 alsa.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/alsa.spec b/alsa.spec
index 009dab1..85aaf69 100644
--- a/alsa.spec
+++ b/alsa.spec
@@ -34,7 +34,7 @@ Obsoletes:      alsa-64bit
 #
 Summary:        Advanced Linux Sound Architecture
 Version:        1.0.24.1
-Release:        1
+Release:        6
 Source:         ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2
 Source2:        baselibs.conf
 Source8:        40-alsa.rules

From 8e85c10baccf025eb658877cf19ac9d0c39f7db5a6b75f52572631cf1650377a Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.com>
Date: Thu, 31 Mar 2011 13:03:56 +0000
Subject: [PATCH 2/2] - Fix typos in the previous fix; the correct path is  
 /var/lib/alsa/asound.state

OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=75
---
 alsa-init.sh       | 2 +-
 alsa.changes       | 6 ++++++
 alsa.spec          | 6 +++---
 alsasound          | 2 +-
 set_default_volume | 2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/alsa-init.sh b/alsa-init.sh
index b9c5afe..dc61dc1 100644
--- a/alsa-init.sh
+++ b/alsa-init.sh
@@ -2,7 +2,7 @@
 # alsa-init card#
 
 /usr/bin/set_default_volume -f $1 >/dev/null 2>&1
-test -s /var/lib/asound.state && /usr/sbin/alsactl -F restore $1 >/dev/null 2>&1
+test -s /var/lib/alsa/asound.state && /usr/sbin/alsactl -F restore $1 >/dev/null 2>&1
 # increase buffer-preallocation size (for PA)
 if [ -f /proc/asound/card$1/pcm0p/sub0/prealloc_max ]; then
     pmax=$(< /proc/asound/card$1/pcm0p/sub0/prealloc_max)
diff --git a/alsa.changes b/alsa.changes
index 28546b1..6d592d0 100644
--- a/alsa.changes
+++ b/alsa.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Mar 31 15:00:07 CEST 2011 - tiwai@suse.de
+
+- Fix typos in the previous fix; the correct path is
+  /var/lib/alsa/asound.state
+
 -------------------------------------------------------------------
 Fri Mar 25 11:41:18 CET 2011 - tiwai@suse.de
 
diff --git a/alsa.spec b/alsa.spec
index 85aaf69..cfba78a 100644
--- a/alsa.spec
+++ b/alsa.spec
@@ -167,8 +167,8 @@ mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 install -c -m 0755 %{SOURCE16} $RPM_BUILD_ROOT%{_bindir}
 install -c -m 0755 %{SOURCE34} $RPM_BUILD_ROOT%{_sbindir}/alsa-init
 %if %suse_version < 1140
-sed -i -e 's@/var/lib/asound.state@/etc/asound.state@g' $RPM_BUILD_ROOT%{_bindir}/set_default_volume
-sed -i -e 's@/var/lib/asound.state@/etc/asound.state@g' $RPM_BUILD_ROOT%{_sbindir}/alsa-init
+sed -i -e 's@/var/lib/alsa/asound.state@/etc/asound.state@g' $RPM_BUILD_ROOT%{_bindir}/set_default_volume
+sed -i -e 's@/var/lib/alsa/asound.state@/etc/asound.state@g' $RPM_BUILD_ROOT%{_sbindir}/alsa-init
 %endif
 # install test wave file
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/sounds/alsa
@@ -185,7 +185,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/init.d
 install -c -m 0755 %{SOURCE11} $RPM_BUILD_ROOT/etc/init.d
 install -c -m 0755 %{SOURCE13} $RPM_BUILD_ROOT/etc/init.d
 %if %suse_version < 1140
-sed -i -e 's@/var/lib/asound.state@/etc/asound.state@g' $RPM_BUILD_ROOT/etc/init.d/alsasound
+sed -i -e 's@/var/lib/alsa/asound.state@/etc/asound.state@g' $RPM_BUILD_ROOT/etc/init.d/alsasound
 %endif
 rm -f $RPM_BUILD_ROOT%{_sbindir}/rcalsasound
 ln -s ../../etc/init.d/alsasound $RPM_BUILD_ROOT%{_sbindir}/rcalsasound
diff --git a/alsasound b/alsasound
index d3f374d..0791e12 100644
--- a/alsasound
+++ b/alsasound
@@ -58,7 +58,7 @@
 rc_reset
 
 alsactl=/usr/sbin/alsactl
-asoundcfg=/var/lib/asound.state
+asoundcfg=/var/lib/alsa/asound.state
 aconnect=/usr/bin/aconnect
 
 #
diff --git a/set_default_volume b/set_default_volume
index d63db05..79350c7 100644
--- a/set_default_volume
+++ b/set_default_volume
@@ -7,7 +7,7 @@
 # written by Takashi Iwai <tiwai@suse.de>
 #
 
-if [ -f /var/lib/asound.state -a x$1 != x-f ]; then
+if [ -f /var/lib/alsa/asound.state -a x$1 != x-f ]; then
   /usr/sbin/alsactl restore >/dev/null 2>&1
   exit 0
 fi