commit pulseaudio for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package pulseaudio for openSUSE:Factory
checked in at Wed Mar 23 16:05:26 CET 2011.



--------
--- pulseaudio/pulseaudio.changes       2011-02-17 17:55:38.000000000 +0100
+++ /mounts/work_src_done/STABLE/pulseaudio/pulseaudio.changes  2011-03-21 
14:51:53.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Mar 21 14:51:21 CET 2011 - ti...@suse.de
+
+- Fix handling of /etc/mplayer/mplayer.conf in setup-pulseaudio
+  script (bnc#681113)
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ pulseaudio.spec ++++++
--- /var/tmp/diff_new_pack.jReBf7/_old  2011-03-23 16:05:01.000000000 +0100
+++ /var/tmp/diff_new_pack.jReBf7/_new  2011-03-23 16:05:01.000000000 +0100
@@ -22,7 +22,7 @@
 Name:           pulseaudio
 Summary:        A Networked Sound Server
 Version:        0.9.22
-Release:        8
+Release:        9
 License:        GPLv2+ ; LGPLv2.1+
 Group:          System/Sound Daemons
 Source:         %{name}-%{version}.tar.bz2

++++++ setup-pulseaudio ++++++
--- /var/tmp/diff_new_pack.jReBf7/_old  2011-03-23 16:05:01.000000000 +0100
+++ /var/tmp/diff_new_pack.jReBf7/_new  2011-03-23 16:05:01.000000000 +0100
@@ -28,6 +28,8 @@
 PROFNAME=/etc/profile.d/pulseaudio.sh
 CPROFNAME=/etc/profile.d/pulseaudio.csh
 
+MPLAYER_CONF=/etc/mplayer/mplayer.conf
+
 set_variable () {
     if test -f $PROFNAME &&
        grep -q "export $1"= $PROFNAME; then
@@ -79,11 +81,13 @@
 
 enable_mplayer() {
     echo "Enabling PulseAudio for mplayer..."
-    if test -f /etc/mplayer/mplayer.conf; then
-       if grep -q '^ao=' /etc/mplayer/mplayer.conf; then
-           perl -pi -e "s|^ao=.*|ao=pulse|g;" /etc/mplayer/mplayer.conf
+    if test -f $MPLAYER_CONF; then
+       if grep -q '^ao *= *pulse' $MPLAYER_CONF; then
+           :
+       elif grep -q '^ao *=' $MPLAYER_CONF; then
+           sed -i -e 's/^ao *= *\(.*\)$/ao=pulse,\1/g' $MPLAYER_CONF
        else
-           echo "ao=pulse" >> /etc/mplayer/mplayer.conf
+           echo "ao=pulse" >> $MPLAYER_CONF
        fi
     fi
 
@@ -178,9 +182,10 @@
 }
 
 disable_mplayer() {
-    if test -f /etc/mplayer/mplayer.conf; then
+    if test -f $MPLAYER_CONF; then
        echo "Disabling PulseAudio for mplayer..."
-       perl -pi -e "s|ao=pulse||g;" /etc/mplayer/mplayer.conf
+       sed -i -e 's/^ao *= *pulse,*/ao=/g' \
+               -e 's/^ao *= *$/ao=alsa/g' $MPLAYER_CONF
     fi
 }
 


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org