[pulseaudio/f20] ship a single autostart file

[Rex Dieter]

commit 258a884dbe3eaf2cd83e185de19a8fbd6e177130
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Oct 14 09:51:21 2013 -0500

    ship a single autostart file

 pulseaudio-x11_device_manager.patch |   14 ++++++++++++++
 pulseaudio.spec                     |   18 ++++++++++++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)
---
diff --git a/pulseaudio-x11_device_manager.patch b/pulseaudio-x11_device_manager.patch
new file mode 100644
index 0000000..f8e4cdf
--- /dev/null
+++ b/pulseaudio-x11_device_manager.patch
@@ -0,0 +1,14 @@
+diff -up pulseaudio-4.0-266-gf81e3/src/daemon/start-pulseaudio-x11.in.x11_device_manager pulseaudio-4.0-266-gf81e3/src/daemon/start-pulseaudio-x11.in
+--- pulseaudio-4.0-266-gf81e3/src/daemon/start-pulseaudio-x11.in.x11_device_manager	2013-10-10 17:02:01.000000000 -0500
++++ pulseaudio-4.0-266-gf81e3/src/daemon/start-pulseaudio-x11.in	2013-10-14 09:44:04.375542726 -0500
+@@ -26,6 +26,10 @@ if [ x"$DISPLAY" != x ] ; then
+     @PACTL_BINARY@ load-module module-x11-publish "display=$DISPLAY" > /dev/null
+     @PACTL_BINARY@ load-module module-x11-cork-request "display=$DISPLAY" > /dev/null
+ 
++    if [ x"$KDE_FULL_SESSION" = x"true" ]; then
++       @PACTL_BINARY@ load-module module-device-manager "do_routing=1" > /dev/null
++    fi
++
+     if [ x"$SESSION_MANAGER" != x ] ; then
+ 	@PACTL_BINARY@ load-module module-x11-xsmp "display=$DISPLAY session_manager=$SESSION_MANAGER" > /dev/null
+     fi
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 60d69d3..9ba14ed 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -12,7 +12,7 @@
 Name:           pulseaudio
 Summary:        Improved Linux Sound Server
 Version:        %{pa_major}%{?pa_minor:.%{pa_minor}}
-Release:        5%{?gitcommit:.git%{shortcommit}}%{?dist}
+Release:        6%{?gitcommit:.git%{shortcommit}}%{?dist}
 License:        LGPLv2+
 URL:            http://www.freedesktop.org/wiki/Software/PulseAudio
 %if 0%{?gitrel}
@@ -24,6 +24,10 @@ Source0:        http://freedesktop.org/software/pulseaudio/releases/pulseaudio-%
 %endif
 Source1:        default.pa-for-gdm
 
+## upstreamable patches
+# simplify and ship only 1 autostart file
+Patch1: pulseaudio-x11_device_manager.patch
+
 ## upstream patches
 
 BuildRequires:  m4
@@ -196,6 +200,8 @@ 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 .x11_device_manager
+
 sed -i.no_consolekit -e \
   's/^load-module module-console-kit/#load-module module-console-kit/' \
   src/daemon/default.pa.in
@@ -245,6 +251,10 @@ rm -fv $RPM_BUILD_ROOT%{_libdir}/pulse-%{pa_major}/modules/module-detect.so
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/pulse
 install -p -m644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_localstatedir}/lib/gdm/.pulse/default.pa
 
+# x11_device_manager folds -kde functionality into single -x11 autostart, so this
+# one is no longer needed
+rm -fv $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/pulseaudio-kde.desktop
+
 
 %find_lang %{name}
 
@@ -388,7 +398,8 @@ exit 0
 
 %files module-x11
 %config %{_sysconfdir}/xdg/autostart/pulseaudio.desktop
-%config %{_sysconfdir}/xdg/autostart/pulseaudio-kde.desktop
+## no longer included per x11_device_manager.patch
+#config %{_sysconfdir}/xdg/autostart/pulseaudio-kde.desktop
 %{_bindir}/start-pulseaudio-kde
 %{_bindir}/start-pulseaudio-x11
 %{_libdir}/pulse-%{pa_major}/modules/module-x11-bell.so
@@ -476,6 +487,9 @@ exit 0
 %attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa
 
 %changelog
+* Mon Oct 14 2013 Rex Dieter <rdieter at fedoraproject.org> - 4.0-6.gitf81e3 
+- ship a single autostart file
+
 * Fri Oct 11 2013 Rex Dieter <rdieter at fedoraproject.org> - 4.0-5.gitf81e3
 - fresh snapshot