OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pulseaudio?expand=0&rev=21

pulseaudio.spec

@@ -15,7 +15,7 @@ Name:           pulseaudio
 %define drvver 0.9
 Summary:        A Networked Sound Server
 Version:        0.9.10
-Release:        17
+Release:        19
 License:        GPL v2 or later; LGPL v2.1 or later
 Group:          System/Sound Daemons
 Source:         %{name}-%{version}.tar.bz2
@@ -28,8 +28,6 @@ PreReq:         pwdutils
 Patch0:         pulseaudio-0.9.8-unbreak-tunnels.patch
 # PATCH-FIX-UPSTREAM pulseaudio-declarations.patch maw@novell.com -- Already fixed in git; will go away on the next release
 Patch1:         pulseaudio-declarations.patch
-# PATCH-FIX-OPENSUSE pulseaudio-use-correct-socket-for-esd-375701.patch bnc375701 rodrigo@novell.com
-Patch2:         pulseaudio-use-correct-socket-for-esd-375701.patch
 # PATCH FIX-UPSTREAM pulseaudio-defaults-daemon-conf.patch
 Patch3:         pulseaudio-defaults-daemon-conf.patch
 
@@ -310,7 +308,6 @@ Authors:
 %setup -q -T -b0
 %patch0 -p1
 %patch1 -p0
-%patch2 -p1
 %patch3 -p1
 
 %build
@@ -527,6 +524,9 @@ groupadd -r pulse-access &>/dev/null || :
 %{_mandir}/man1/pax11publish.1.gz
 
 %changelog
+* Mon May 19 2008 rodrigo@suse.de
+- Removed pulseaudio-use-correct-socket-for-esd-375701.patch,
+  which conflicts with esound patch (bnc#391864)
 * Mon May 12 2008 rodrigo@suse.de
 - Added pulseaudio-defaults-daemon-conf.patch to set default
   values for better performance (bnc#381686)