From a6b76cb5e52948fe0c6d4ce40317f9e93b85d649 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@fedoraproject.org>
Date: Oct 01 2007 10:46:35 +0000
Subject: - added a patch for alsactl (#255421)


---

diff --git a/alsa-utils-1.0.14-statedir.patch b/alsa-utils-1.0.14-statedir.patch
new file mode 100644
index 0000000..ee2f865
--- /dev/null
+++ b/alsa-utils-1.0.14-statedir.patch
@@ -0,0 +1,70 @@
+--- alsa-utils-1.0.14/alsaconf/alsaconf.in~	2007-05-31 11:07:21.000000000 +0300
++++ alsa-utils-1.0.14/alsaconf/alsaconf.in	2007-08-26 22:40:21.000000000 +0300
+@@ -938,8 +938,8 @@ If you have a big amplifier, lower your 
+ 	  aplay -N $TESTSOUND
+       fi
+     fi
+-    if [ ! -r /etc/asound.state ]; then
+-	xecho "Saving the mixer setup used for this in /etc/asound.state."
++    if [ ! -r /etc/alsa/asound.state ]; then
++	xecho "Saving the mixer setup used for this in /etc/alsa/asound.state."
+ 	$sbindir/alsactl store
+     fi
+     clear
+--- alsa-utils-1.0.14/alsaconf/po/ja.po~	2007-05-31 11:07:21.000000000 +0300
++++ alsa-utils-1.0.14/alsaconf/po/ja.po	2007-08-26 22:40:43.000000000 +0300
+@@ -203,8 +203,8 @@ msgstr ""
+ "  テスト音が聞こえるかどうか確認してください。\n"
+ 
+ #: ../alsaconf.in:932
+-msgid "Saving the mixer setup used for this in /etc/asound.state."
+-msgstr "ミキサーの設定を /etc/asound.state に保存します"
++msgid "Saving the mixer setup used for this in /etc/alsa/asound.state."
++msgstr "ミキサーの設定を /etc/alsa/asound.state に保存します"
+ 
+ #: ../alsaconf.in:936
+ msgid ""
+--- alsa-utils-1.0.14/alsaconf/po/ru.po~	2007-05-31 11:07:21.000000000 +0300
++++ alsa-utils-1.0.14/alsaconf/po/ru.po	2007-08-26 22:40:34.000000000 +0300
+@@ -211,8 +211,8 @@ msgstr ""
+ "  и удостоверьтесь что вы слышите тестовый пример.\n"
+ 
+ #: ../alsaconf.in:932
+-msgid "Saving the mixer setup used for this in /etc/asound.state."
+-msgstr "Сохраняем настройки микшера в /etc/asound.state."
++msgid "Saving the mixer setup used for this in /etc/alsa/asound.state."
++msgstr "Сохраняем настройки микшера в /etc/alsa/asound.state."
+ 
+ #: ../alsaconf.in:936
+ msgid ""
+--- alsa-utils-1.0.14/alsactl/alsactl.1~	2007-05-31 11:07:21.000000000 +0300
++++ alsa-utils-1.0.14/alsactl/alsactl.1	2007-08-26 22:40:03.000000000 +0300
+@@ -35,7 +35,7 @@ Help: show available flags and commands.
+ 
+ .TP
+ \fI\-f, \-\-file\fP
+-Select the configuration file to use. The default is /etc/asound.state or
++Select the configuration file to use. The default is /etc/alsa/asound.state or
+ /etc/asound.names (for the \fInames\fP command).
+ 
+ .TP
+@@ -52,7 +52,7 @@ Use debug mode: a bit more verbose.
+ Print alsactl version number.
+ 
+ .SH FILES
+-\fI/etc/asound.state\fP (or whatever file you specify with the
++\fI/etc/alsa/asound.state\fP (or whatever file you specify with the
+ \fB\-f\fP flag) is used to store current settings for your
+ soundcards. The settings include all the usual soundcard mixer
+ settings.  More importantly, alsactl is
+--- alsa-utils-1.0.14/alsactl/alsactl.c~	2007-05-31 11:07:21.000000000 +0300
++++ alsa-utils-1.0.14/alsactl/alsactl.c	2007-08-26 22:40:10.000000000 +0300
+@@ -30,7 +30,7 @@
+ #include <alsa/asoundlib.h>
+ #include "alsactl.h"
+ 
+-#define SYS_ASOUNDRC "/etc/asound.state"
++#define SYS_ASOUNDRC "/etc/alsa/asound.state"
+ #define SYS_ASOUNDNAMES "/etc/asound.names"
+ 
+ int debugflag = 0;
diff --git a/alsa-utils.spec b/alsa-utils.spec
index c864579..e56d547 100644
--- a/alsa-utils.spec
+++ b/alsa-utils.spec
@@ -1,7 +1,7 @@
 Summary: 	Advanced Linux Sound Architecture (ALSA) utilities
 Name: 		alsa-utils
 Version: 	1.0.14
-Release: 	1%{?prever_dot}%{?dist}
+Release: 	2%{?prever_dot}%{?dist}
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
@@ -11,6 +11,7 @@ Source3: 	alsacard.c
 Source4: 	alsaunmute.c
 Source10:	alsa.rules
 Patch:		alsa-utils-1.0.14-alsaconf.patch
+Patch1:		alsa-utils-1.0.14-statedir.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	alsa-lib-devel >= %{version}
 BuildRequires:	ncurses-devel
@@ -24,6 +25,7 @@ Architecture (ALSA).
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
 %patch -p1
+%patch1 -p1 -b .statedir
 
 %build
 %configure CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" --sbindir=/sbin
@@ -50,6 +52,10 @@ install -m 755 salsa %{buildroot}/sbin
 mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
 ln -s ../../sbin/alsactl $RPM_BUILD_ROOT/%{_sbindir}/alsactl
 
+# Create a place for volume configuration
+mkdir -p $RPM_BUILD_ROOT/etc/alsa
+touch $RPM_BUILD_ROOT/etc/alsa/asound.state
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -69,8 +75,13 @@ ln -s ../../sbin/alsactl $RPM_BUILD_ROOT/%{_sbindir}/alsactl
 %dir %{_datadir}/alsa/speaker-test
 %{_datadir}/alsa/speaker-test/*
 /usr/share/locale/*
+%dir /etc/alsa/
+%ghost /etc/alsa/asound.state
 
 %changelog
+* Mon Oct 1 2007 Martin Stransky <stransky@redhat.com> 1.0.14-2
+- added a patch for alsactl (#255421)
+
 * Wed Jul 25 2007 Martin Stransky <stransky@redhat.com> 1.0.14-1
 - release bump