rpms/alsa-utils/devel alsa-utils-1.0.14-statedir.patch, 1.1, 1.2 alsa-utils.spec, 1.62, 1.63 salsa.c, 1.7, 1.8

[Martin Stransky (stransky)]

Author: stransky

Update of /cvs/pkgs/rpms/alsa-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12716

Modified Files:
	alsa-utils-1.0.14-statedir.patch alsa-utils.spec salsa.c 
Log Message:
* Mon Oct 1 2007 Martin Stransky <stransky at redhat.com> 1.0.15-0.4.rc1
- moved saved volume settings back to /etc/alsa
  (per discussion at #293301)



alsa-utils-1.0.14-statedir.patch:

Index: alsa-utils-1.0.14-statedir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa-utils-1.0.14-statedir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alsa-utils-1.0.14-statedir.patch	19 Sep 2007 14:56:45 -0000	1.1
+++ alsa-utils-1.0.14-statedir.patch	1 Oct 2007 09:54:09 -0000	1.2
@@ -6,8 +6,8 @@
      fi
 -    if [ ! -r /etc/asound.state ]; then
 -	xecho "Saving the mixer setup used for this in /etc/asound.state."
-+    if [ ! -r /var/lib/alsa/asound.state ]; then
-+	xecho "Saving the mixer setup used for this in /var/lib/alsa/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
@@ -19,8 +19,8 @@
  #: ../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 /var/lib/alsa/asound.state."
-+msgstr "ミキサーの設定を /var/lib/alsa/asound.state に保存します"
++msgid "Saving the mixer setup used for this in /etc/alsa/asound.state."
++msgstr "ミキサーの設定を /etc/alsa/asound.state に保存します"
  
  #: ../alsaconf.in:936
  msgid ""
@@ -32,8 +32,8 @@
  #: ../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 /var/lib/alsa/asound.state."
-+msgstr "Сохраняем настройки микшера в /var/lib/alsa/asound.state."
++msgid "Saving the mixer setup used for this in /etc/alsa/asound.state."
++msgstr "Сохраняем настройки микшера в /etc/alsa/asound.state."
  
  #: ../alsaconf.in:936
  msgid ""
@@ -44,7 +44,7 @@
  .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 /var/lib/alsa/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
@@ -53,7 +53,7 @@
  
  .SH FILES
 -\fI/etc/asound.state\fP (or whatever file you specify with the
-+\fI/var/lib/alsa/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
@@ -64,7 +64,7 @@
  #include "alsactl.h"
  
 -#define SYS_ASOUNDRC "/etc/asound.state"
-+#define SYS_ASOUNDRC "/var/lib/alsa/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/devel/alsa-utils.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- alsa-utils.spec	25 Sep 2007 09:01:22 -0000	1.62
+++ alsa-utils.spec	1 Oct 2007 09:54:09 -0000	1.63
@@ -4,7 +4,7 @@
 Summary: Advanced Linux Sound Architecture (ALSA) utilities
 Name:    alsa-utils
 Version: 1.0.15
-Release: 0.3%{?prever_dot}%{?dist}
+Release: 0.4%{?prever_dot}%{?dist}
 License: GPLv2+
 Group:   Applications/Multimedia
 URL:     http://www.alsa-project.org/
@@ -56,8 +56,8 @@
 ln -s ../../sbin/alsactl $RPM_BUILD_ROOT/%{_sbindir}/alsactl
 
 # Create a place for volume configuration
-mkdir -p $RPM_BUILD_ROOT/var/lib/alsa
-touch $RPM_BUILD_ROOT/var/lib/alsa/asound.state
+mkdir -p $RPM_BUILD_ROOT/etc/alsa
+touch $RPM_BUILD_ROOT/etc/alsa/asound.state
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -73,11 +73,15 @@
 %{_datadir}/alsa/
 %{_datadir}/sounds/
 %{_mandir}/man?/*
-%dir /var/lib/alsa/
-%ghost /var/lib/alsa/asound.state
+%dir /etc/alsa/
+%ghost /etc/alsa/asound.state
 
 
 %changelog
+* Mon Oct 1 2007 Martin Stransky <stransky at redhat.com> 1.0.15-0.4.rc1
+- moved saved volume settings back to /etc/alsa
+  (per discussion at #293301)
+
 * Mon Sep 24 2007 Martin Stransky <stransky at redhat.com> 1.0.15-0.3.rc1
 - fixed #303151 - wrong salsa dir in /etc/udev/rules.d/90-alsa.rules
 


Index: salsa.c
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/salsa.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- salsa.c	19 Sep 2007 12:26:53 -0000	1.7
+++ salsa.c	1 Oct 2007 09:54:09 -0000	1.8
@@ -20,7 +20,7 @@
 
 #include <alsa/asoundlib.h>
 
-#define ALSA_CONFIG_PATH	"/var/lib/alsa/asound.state"
+#define ALSA_CONFIG_PATH	"/etc/alsa/asound.state"
 #define ALL_CARDS         	(-1)