- add patch to fix defaults syntax

- add pretrans trigger to move old dir away (can break in the same way fiel does)

Changed files:
    alsa-utils-syntax.patch -> 1.1
    alsa-utils.spec -> 1.161

diff --git a/alsa-utils-syntax.patch b/alsa-utils-syntax.patch
new file mode 100644 (file)
index 0000000..dece760
--- /dev/null
+++ b/alsa-utils-syntax.patch
@@ -0,0 +1,35 @@
+From 0d3aeb969592134f7749bd21fd2f641eb13d7090 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@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@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
+

diff --git a/alsa-utils.spec b/alsa-utils.spec
index 3c25bec78f4a6c090f936e45c9ed15ebb632bd1f..4d33db47bb95b273ddd3cf2b49bf4851a7c2fecd 100644 (file)
--- a/alsa-utils.spec
+++ b/alsa-utils.spec
@@ -6,7 +6,7 @@ Summary(ru.UTF-8):      Утилиты командной строки для ALSA pr
 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
@@ -19,6 +19,7 @@ Source4:      alsactl.conf
 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
@@ -98,6 +99,7 @@ Skrypt init dla Advanced Linux Sound Architecture.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__gettextize}
@@ -138,6 +140,15 @@ echo ".so aplay.1" > $RPM_BUILD_ROOT%{_mandir}/man1/arecord.1
 %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"