rpms/alsa-utils/F-7 alsa-utils-1.0.14-statedir.patch, NONE, 1.1 alsa-utils.spec, 1.55, 1.56

[Martin Stransky (stransky) <fedora-extras-commits redhat com>]

Author: stransky

Update of /cvs/pkgs/rpms/alsa-utils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20946

Modified Files:
	alsa-utils.spec 
Added Files:
	alsa-utils-1.0.14-statedir.patch 
Log Message:
* Mon Oct 1 2007 Martin Stransky <stransky redhat com> 1.0.14-2
- added a patch for alsactl (#255421)



alsa-utils-1.0.14-statedir.patch:

--- NEW FILE alsa-utils-1.0.14-statedir.patch ---
--- 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;


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/F-7/alsa-utils.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- alsa-utils.spec	1 Aug 2007 08:54:25 -0000	1.55
+++ alsa-utils.spec	1 Oct 2007 10:46:35 -0000	1.56
@@ -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 @@
 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 @@
 %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 @@
 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 @@
 %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