rpms/pulseaudio/devel pulseaudio-0.9.15-no-daemon-if-remote-desktop.patch, NONE, 1.1 pulseaudio.spec, 1.80, 1.81

[Warren Togami 砥上勇]

Author: wtogami

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20411

Modified Files:
	pulseaudio.spec 
Added Files:
	pulseaudio-0.9.15-no-daemon-if-remote-desktop.patch 
Log Message:
* Wed Apr 22 2009 Warren Togami <wtogami at redhat.com> 0.9.15-11
- 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/devel/pulseaudio.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- pulseaudio.spec	13 Apr 2009 23:37:51 -0000	1.80
+++ pulseaudio.spec	22 Apr 2009 20:54:34 -0000	1.81
@@ -3,10 +3,11 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.15
-Release:	10%{?dist}
+Release:	11%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
+Patch0:         pulseaudio-0.9.15-no-daemon-if-remote-desktop.patch
 URL:		http://pulseaudio.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  m4
@@ -187,6 +188,7 @@
 
 %prep
 %setup -q -T -b0
+%patch0 -p1 
 
 %build
 CFLAGS="-ggdb" %configure --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-realtime-group=pulse-rt --with-access-group=pulse-access
@@ -407,6 +409,10 @@
 %{_mandir}/man1/pax11publish.1.gz
 
 %changelog
+* Wed Apr 22 2009 Warren Togami <wtogami at redhat.com> 0.9.15-11
+- Bug #497214
+  Do not start pulseaudio daemon if PULSE_SERVER directs pulse elsewhere.
+
 * Mon Apr 13 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.15-10
 - Final 0.9.15 release