packages: alsa-utils/alsa-utils.spec, alsa-utils/alsa-utils-syntax.patch (N...

[patrys]

Author: patrys                       Date: Thu Jun 11 19:25:54 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add patch to fix defaults syntax
- add pretrans trigger to move old dir away (can break in the same way fiel does)

---- Files affected:
packages/alsa-utils:
   alsa-utils.spec (1.160 -> 1.161) , alsa-utils-syntax.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/alsa-utils/alsa-utils.spec
diff -u packages/alsa-utils/alsa-utils.spec:1.160 packages/alsa-utils/alsa-utils.spec:1.161
--- packages/alsa-utils/alsa-utils.spec:1.160	Thu Jun 11 16:55:14 2009
+++ packages/alsa-utils/alsa-utils.spec	Thu Jun 11 21:25:48 2009
@@ -7,7 +7,7 @@
 Summary(uk.UTF-8):	Утиліти командного рядка для ALSA project
 Name:		alsa-utils
 Version:	1.0.20
-Release:	4
+Release:	5
 # some apps GPL v2, some GPL v2+
 License:	GPL v2
 Group:		Applications/Sound
@@ -20,6 +20,7 @@
 URL:		http://www.alsa-project.org/
 Patch0:		%{name}-fast_sampling.patch
 Patch1:		%{name}-modprobe.patch
+Patch2:		%{name}-syntax.patch
 BuildRequires:	alsa-lib-devel >= 1.0.14
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
@@ -99,6 +100,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__gettextize}
@@ -139,6 +141,15 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pretrans
+# this needs to be a dir
+if [ -d %{_datadir}/alsa/init ]; then
+	mv -b %{_datadir}/alsa/init{,.dir}
+%banner -e %{name} <<EOF
+Check %{_datadir}/alsa/init.dir for your own files and remove it when done.
+EOF
+fi
+
 %post init
 /sbin/chkconfig --add alsasound
 %service alsasound restart "ALSA %{version} services"
@@ -190,6 +201,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.161  2009/06/11 19:25:48  patrys
+- add patch to fix defaults syntax
+- add pretrans trigger to move old dir away (can break in the same way fiel does)
+
 Revision 1.160  2009/06/11 14:55:14  patrys
 - make sound cards work by default
 - move necessary utils from /prefix to /

================================================================
Index: packages/alsa-utils/alsa-utils-syntax.patch
diff -u /dev/null packages/alsa-utils/alsa-utils-syntax.patch:1.1
--- /dev/null	Thu Jun 11 21:25:54 2009
+++ packages/alsa-utils/alsa-utils-syntax.patch	Thu Jun 11 21:25:48 2009
@@ -0,0 +1,35 @@
+From 0d3aeb969592134f7749bd21fd2f641eb13d7090 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex at perex.cz>
+Date: Fri, 15 May 2009 12:37:48 +0200
+Subject: [PATCH] alsactl: fixed Headphone Playback Volume setting in default rules
+
+Signed-off-by: Jaroslav Kysela <perex at perex.cz>
+---
+ alsactl/init/default |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/alsactl/init/default b/alsactl/init/default
+index c9aa7cc..af0f94f 100644
+--- a/alsactl/init/default
++++ b/alsactl/init/default
+@@ -46,7 +46,7 @@ CTL{name}="Front Playback Switch",PROGRAM=="__ctl_search", \
+   CTL{values}="on"
+ 
+ CTL{reset}="mixer"
+-CTL{name}="Headphone Playback Volume",PROGRAM=="__ctl_search",GOTO="headphone0_end"
++CTL{name}="Headphone Playback Volume",PROGRAM!="__ctl_search",GOTO="headphone0_end"
+ # if master volume control is present, turn headphone volume to max
+ ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="headphone0_end"
+ ENV{has_pmaster_vol}=="true",CTL{values)="100%",GOTO="headphone0_end"
+@@ -101,7 +101,7 @@ CTL{name}="DAC Playback Switch",PROGRAM=="__ctl_search", \
+   CTL{values}="on"
+ 
+ CTL{reset}="mixer"
+-CTL{name}="Synth Playback Volume",,PROGRAM=="__ctl_search", \
++CTL{name}="Synth Playback Volume",PROGRAM=="__ctl_search", \
+   CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}"
+ CTL{name}="Synth Playback Switch",PROGRAM=="__ctl_search", \
+   CTL{values}="on"
+-- 
+1.5.5.1
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/alsa-utils/alsa-utils.spec?r1=1.160&r2=1.161&f=u