From afeafe34cfcb6baec0fa591dac5f6bc5df0289ef Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Mon, 22 Jun 2015 11:42:22 -0500
Subject: [PATCH] better autostart.patch, handle case were autospawn is
 disabled (or otherwise doesn't work, like for root user)

---
 pulseaudio-autostart.patch | 13 +++++++++++++
 pulseaudio.spec            | 11 ++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 pulseaudio-autostart.patch

diff --git a/pulseaudio-autostart.patch b/pulseaudio-autostart.patch
new file mode 100644
index 0000000..695b34b
--- /dev/null
+++ b/pulseaudio-autostart.patch
@@ -0,0 +1,13 @@
+diff -up pulseaudio-6.0/src/daemon/start-pulseaudio-x11.in.autostart pulseaudio-6.0/src/daemon/start-pulseaudio-x11.in
+--- pulseaudio-6.0/src/daemon/start-pulseaudio-x11.in.autostart	2015-02-12 08:10:35.000000000 -0600
++++ pulseaudio-6.0/src/daemon/start-pulseaudio-x11.in	2015-06-22 11:24:13.561614127 -0500
+@@ -17,6 +17,9 @@
+ 
+ set -e
+ 
++# probe to test if autospawn works, else resort to starting manually
++@PACTL_BINARY@ info 2>&1 > /dev/null || @PA_BINARY@ --start "$@"
++
+ if [ x"$DISPLAY" != x ] ; then
+ 
+     @PACTL_BINARY@ load-module module-x11-publish "display=$DISPLAY" > /dev/null
diff --git a/pulseaudio.spec b/pulseaudio.spec
index f545db2..f8a4cd9 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -19,7 +19,7 @@
 Name:           pulseaudio
 Summary:        Improved Linux Sound Server
 Version:        %{pa_major}%{?pa_minor:.%{pa_minor}}
-Release:        5%{?snap:.%{snap}git%{shortcommit}}%{?dist}
+Release:        6%{?snap:.%{snap}git%{shortcommit}}%{?dist}
 License:        LGPLv2+
 URL:            http://www.freedesktop.org/wiki/Software/PulseAudio
 %if 0%{?gitrel}
@@ -34,6 +34,11 @@ Source2:        http://freedesktop.org/software/pulseaudio/releases/pulseaudio-%
 
 Source5:        default.pa-for-gdm
 
+# revert upstream commit to rely solely on autospawn for autostart, instead
+# include a fallback to manual launch when autospawn fails, like when
+# user disables autospawn, or logging in as root
+Patch1: pulseaudio-autostart.patch
+
 ## upstream patches
 Patch35: 0035-pstream-Don-t-split-non-SHM-memblocks.patch
 Patch37: 0037-pstream-Remove-unnecessary-if-condition.patch
@@ -223,6 +228,7 @@ This package contains GDM integration hooks for the PulseAudio sound server.
 %prep
 %setup -q -T -b0 -n %{name}-%{version}%{?gitrel:-%{gitrel}-g%{shortcommit}}
 
+%patch1 -p1 -b .autostart
 %patch35 -p1 -b .0035
 %patch37 -p1 -b .0037
 
@@ -567,6 +573,9 @@ exit 0
 
 
 %changelog
+* Mon Jun 22 2015 Rex Dieter <rdieter@fedoraproject.org> - 6.0-6
+- better autostart.patch, handle case were autospawn is disabled (or otherwise doesn't work, like for root user)
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild