From b5073d1e26f6d555506f01dd64766b6ae7b6d78b84ee063baffb2eecc9a315e1 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.com>
Date: Sat, 16 Apr 2016 08:32:21 +0000
Subject: [PATCH] Accepting request 390178 from
 home:tiwai:branches:multimedia:libs

- Use /etc/pulse/client.conf.d/50-system.conf as a system setup by
  setup-pulseaudio script instead of modifying the global config.

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

diff --git a/pulseaudio.changes b/pulseaudio.changes
index 18cc0ce..a212cbd 100644
--- a/pulseaudio.changes
+++ b/pulseaudio.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 14 12:45:13 CEST 2016 - tiwai@suse.de
+
+- Use /etc/pulse/client.conf.d/50-system.conf as a system setup by
+  setup-pulseaudio script instead of modifying the global config.
+
 -------------------------------------------------------------------
 Mon Apr  4 14:06:06 CEST 2016 - tiwai@suse.de
 
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 4134987..de61be1 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -392,6 +392,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/pulse/client.conf.d
 mkdir -p %{buildroot}%{_sysconfdir}/pulse/daemon.conf.d
 # Install disable_flat_volumes.conf
 install -m 0644 %{S:6} %{buildroot}%{_sysconfdir}/pulse/daemon.conf.d
+# created by setup-pulseaudio script
+touch %{buildroot}%{_sysconfdir}/pulse/client.conf.d/50-system.conf
 %fdupes doxygen/html
 
 %pre
@@ -551,6 +553,7 @@ exit 0
 # created by setup-pulseaudio script
 %ghost %{_sysconfdir}/profile.d/pulseaudio.sh
 %ghost %{_sysconfdir}/profile.d/pulseaudio.csh
+%ghost %{_sysconfdir}/pulse/client.conf.d/50-system.conf
 
 %files esound-compat
 %defattr(-,root,root)
diff --git a/setup-pulseaudio b/setup-pulseaudio
index 305a1af..2ac994b 100644
--- a/setup-pulseaudio
+++ b/setup-pulseaudio
@@ -28,6 +28,7 @@ check_root() {
 
 PROFNAME=/etc/profile.d/pulseaudio.sh
 CPROFNAME=/etc/profile.d/pulseaudio.csh
+pulse_client_conf=/etc/pulse/client.conf.d/50-system.conf
 
 MPLAYER_CONF=/etc/mplayer/mplayer.conf
 
@@ -199,10 +200,10 @@ enable_qemu () {
 
 enable_autospawn() {
     echo "Enabling PulseAudio autospawn..."
-    if grep -q ^autospawn /etc/pulse/client.conf; then
-	sed -i -e "s|^autospawn.*|autospawn = yes|g" /etc/pulse/client.conf
+    if grep -q ^autospawn $pulse_client_conf >/dev/null 2>&1; then
+	sed -i -e "s|^autospawn.*|autospawn = yes|g" $pulse_client_conf
     else
-	echo "autospawn = yes" >> /etc/pulse/client.conf
+	echo "autospawn = yes" >> $pulse_client_conf
     fi
 }
 
@@ -306,10 +307,10 @@ disable_qemu () {
 
 disable_autospawn() {
     echo "Disabling PulseAudio autospawn..."
-    if grep -q ^autospawn /etc/pulse/client.conf; then
-	sed -i -e "s|^autospawn.*|autospawn = no|g" /etc/pulse/client.conf
+    if grep -q ^autospawn $pulse_client_conf >/dev/null 2>&1; then
+	sed -i -e "s|^autospawn.*|autospawn = no|g" $pulse_client_conf
     else
-	echo "autospawn = no" >> /etc/pulse/client.conf
+	echo "autospawn = no" >> $pulse_client_conf
     fi
     # kill leftover PA processes
     killall pulseaudio > /dev/null 2>&1