From 7272ecb5f711766662efc70eb24061b3d0a6245fca6ab487702766ebe64f19bb Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Fri, 27 Aug 2010 15:17:31 +0000
Subject: [PATCH] Accepting request 46332 from multimedia:libs

checked in (request 46332)

OBS-URL: https://build.opensuse.org/request/show/46332
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=55
---
 pulseaudio.changes |  6 ------
 pulseaudio.spec    |  6 ------
 setup-pulseaudio   | 14 ++++++--------
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/pulseaudio.changes b/pulseaudio.changes
index eabfc1e..1ee5b10 100644
--- a/pulseaudio.changes
+++ b/pulseaudio.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Thu Aug 12 09:55:04 CEST 2010 - tiwai@suse.de
-
-- minor fixes for setup-pulseaudio (bnc#623837)
-  also added /etc/profile.d/pulseaudio.* to file list as ghost
-
 -------------------------------------------------------------------
 Tue Jul 20 18:41:58 CEST 2010 - tiwai@suse.de
 
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 3da4261..e43b2b4 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -394,9 +394,6 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
 %find_lang %{name}
 install %SOURCE2 $RPM_BUILD_ROOT%{_bindir}
 chmod 755 $RPM_BUILD_ROOT%{_bindir}/setup-pulseaudio
-mkdir -p $RPM_BUILD_ROOT/etc/profile.d
-touch $RPM_BUILD_ROOT/etc/profile.d/pulseaudio.sh
-touch $RPM_BUILD_ROOT/etc/profile.d/pulseaudio.csh
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/gdm/.pulse
 cp $RPM_SOURCE_DIR/default.pa-for-gdm $RPM_BUILD_ROOT%{_localstatedir}/lib/gdm/.pulse/default.pa
 ln -s esdcompat $RPM_BUILD_ROOT%{_bindir}/esd
@@ -436,9 +433,6 @@ groupadd -r pulse-access &>/dev/null || :
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/pulseaudio-system.conf
 %{_bindir}/pulseaudio
 %{_bindir}/setup-pulseaudio
-# created by setup-pulseaudio script
-%ghost /etc/profile.d/pulseaudio.sh
-%ghost /etc/profile.d/pulseaudio.csh
 %dir %{_libdir}/pulse-%{drvver}/
 %dir %{_libdir}/pulse-%{drvver}/modules/
 %{_libdir}/libpulsecore-%{drvver}.so
diff --git a/setup-pulseaudio b/setup-pulseaudio
index 04c7e0b..ff5c908 100644
--- a/setup-pulseaudio
+++ b/setup-pulseaudio
@@ -31,13 +31,13 @@ CPROFNAME=/etc/profile.d/pulseaudio.csh
 set_variable () {
     if test -f $PROFNAME &&
 	grep -q "export $1"= $PROFNAME; then
-	sed -i -e "s|export $1=.*|export $1=$2|g" $PROFNAME
+	sed -ie "s|export $1=.*|export $1=$2|g" $PROFNAME
     else
 	echo "export $1=$2" >> $PROFNAME
     fi
     if test -f $CPROFNAME &&
 	grep -q "setenv $1 " $CPROFNAME; then
-	sed -i -e "s|setenv $1 .*|setenv $1 $2|g" $CPROFNAME
+	sed -ie "s|setenv $1 .*|setenv $1 $2|g" $CPROFNAME
     else
 	echo "setenv $1 $2" >> $CPROFNAME
     fi
@@ -46,11 +46,11 @@ set_variable () {
 delete_variable () {
     if test -f $PROFNAME &&
 	grep -q "export $1"= $PROFNAME; then
-	sed -i -e "/export $1=.*/d" $PROFNAME
+	sed -ie "/export $1=.*/d" $PROFNAME
     fi
     if test -f $CPROFNAME &&
 	grep -q "setenv $1 " $CPROFNAME; then
-	sed -i -e "/setenv $1 .*/d" $CPROFNAME
+	sed -ie "/setenv $1 .*/d" $CPROFNAME
     fi
 }
 
@@ -251,10 +251,8 @@ case $1 in
 	disable_speechd
 	;;
     --status)
-	if [ -f /etc/sysconfig/sound ]; then
-	    . /etc/sysconfig/sound
-	fi
-	if [ "x$PULSEAUDIO_ENABLE" = "xyes" ]; then
+	STATUS=`grep PULSEAUDIO_ENABLE /etc/sysconfig/sound | cut -f2 -d= | cut -f2 -d\"`
+	if [ "x$STATUS" = "xyes" ]; then
 	    echo "enabled"
 	else
 	    echo "disabled"