rpms/esound/devel esound-0.2.35-64bit_install.patch, NONE, 1.1 esound.spec, 1.22, 1.23

[fedora-cvs-commits at redhat.com]

Author: notting

Update of /cvs/dist/rpms/esound/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4312

Modified Files:
	esound.spec 
Added Files:
	esound-0.2.35-64bit_install.patch 
Log Message:
commit changes to devel branch too


esound-0.2.35-64bit_install.patch:
 esddsp.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE esound-0.2.35-64bit_install.patch ---
--- esound-0.2.35/esddsp.in.64bit_install	2004-09-07 17:19:58.539531000 -0400
+++ esound-0.2.35/esddsp.in	2004-09-07 17:21:07.091910000 -0400
@@ -106,7 +106,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 
-LD_PRELOAD="@libdir@/libesddsp.so. at ESD_MAJOR_VERSION@ @libdir@/libesd.so. at ESD_MAJOR_VERSION@ $LD_PRELOAD"
+LD_PRELOAD="libesddsp.so. at ESD_MAJOR_VERSION@ libesd.so. at ESD_MAJOR_VERSION@ $LD_PRELOAD"
 export LD_PRELOAD
 
 # invoke the program with the args given


Index: esound.spec
===================================================================
RCS file: /cvs/dist/rpms/esound/devel/esound.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- esound.spec	2 Mar 2005 22:40:21 -0000	1.22
+++ esound.spec	1 Jun 2005 16:02:35 -0000	1.23
@@ -2,7 +2,7 @@
 Summary: Allows several audio streams to play on a single audio device.
 Name:      esound
 Version:   0.2.35
-Release: 4 
+Release: 5
 Epoch: 1
 License: GPL
 URL: ftp://ftp.gnome.org/pub/GNOME/sources/esound
@@ -11,6 +11,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Patch0: esound-0.2.19-noerrors.patch
 Patch1: esound-0.2.35-manpage.patch
+Patch2: esound-0.2.35-64bit_install.patch
 BuildRequires: docbook-utils, audiofile-devel
 BuildRequires: alsa-lib-devel
 
@@ -40,6 +41,7 @@
 
 %patch0 -p1 -b .noerrors
 %patch1 -p1 -b .manpage
+%patch2 -p1 -b .64bit
 
 %build
 %configure
@@ -87,6 +89,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Jun  1 2005 Bill Nottingham <notting at redhat.com> - 1.0.2.35-5
+- readdd patch to prevent multilib conflicts
+
 * Wed Mar 02 2005 John (J5) Palmieri <johnp at redhat.com> - 1:0.2.35-4
 - Rebuild with gcc 4.0