rpms/pulseaudio/F-10 pulseaudio-0.9.15-no-daemon-if-remote-desktop.patch, NONE, 1.1 pulseaudio.spec, 1.65, 1.66

[Warren Togami 砥上勇]

Author: wtogami

Update of /cvs/pkgs/rpms/pulseaudio/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23391

Modified Files:
	pulseaudio.spec 
Added Files:
	pulseaudio-0.9.15-no-daemon-if-remote-desktop.patch 
Log Message:
- Bug #497214
  Do not start pulseaudio daemon if PULSE_SERVER directs pulse elsewhere.


pulseaudio-0.9.15-no-daemon-if-remote-desktop.patch:

--- NEW FILE pulseaudio-0.9.15-no-daemon-if-remote-desktop.patch ---
diff -urN pulseaudio-0.9.15.orig/src/daemon/start-pulseaudio-x11.in pulseaudio-0.9.15/src/daemon/start-pulseaudio-x11.in
--- pulseaudio-0.9.15.orig/src/daemon/start-pulseaudio-x11.in	2009-02-19 21:26:55.000000000 -0500
+++ pulseaudio-0.9.15/src/daemon/start-pulseaudio-x11.in	2009-04-22 16:48:37.574738056 -0400
@@ -19,6 +19,9 @@
 
 set -e
 
+# Exit without running pulseaudio daemon if this is a remote desktop session
+[ -n "$PULSE_SERVER" ] && exit 0
+
 @PA_BINARY@ --start "$@"
 
 if [ x"$DISPLAY" != x ] ; then


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/F-10/pulseaudio.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- pulseaudio.spec	13 Jan 2009 14:00:55 -0000	1.65
+++ pulseaudio.spec	22 Apr 2009 21:01:56 -0000	1.66
@@ -3,10 +3,11 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.14
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
+Patch2:         pulseaudio-0.9.15-no-daemon-if-remote-desktop.patch
 URL:		http://pulseaudio.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: tcp_wrappers-devel, libsamplerate-devel, libsndfile-devel
@@ -166,6 +167,7 @@
 %prep
 %setup -q -T -b0
 %patch1 -p1 -b .mixer-select
+%patch2 -p1 -b .no-daemon-if-remote-desktop
 
 %build
 CFLAGS="-ggdb" %configure --disable-ltdl-install --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-realtime-group=pulse-rt --with-access-group=pulse-access
@@ -397,6 +399,10 @@
 %{_mandir}/man1/pax11publish.1.gz
 
 %changelog
+* Wed Apr 22 2009 Warren Togami <wtogami at redhat.com> 0.9.14-3
+- Bug #497214
+  Do not start pulseaudio daemon if PULSE_SERVER directs pulse elsewhere.
+
 * Tue Jan 13 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.9.14-2
 - Prefer mixer controls with volumes over switches