From 23d549ac05ab91002bade7648a0b368d4f95fef6 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Jul 27 2006 22:26:49 +0000
Subject: fix multilib conflicts


---

diff --git a/esound-multilib.patch b/esound-multilib.patch
new file mode 100644
index 0000000..c3de4e3
--- /dev/null
+++ b/esound-multilib.patch
@@ -0,0 +1,51 @@
+--- esound-0.2.36/esd-config.in.multilib	2006-07-27 18:15:11.000000000 -0400
++++ esound-0.2.36/esd-config.in	2006-07-27 18:23:50.000000000 -0400
+@@ -1,10 +1,7 @@
+ #!/bin/sh
+ 
+-audiofile_libs="@AUDIOFILE_LIBS@"
+-audiofile_cflags="@AUDIOFILE_CFLAGS@"
+-
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
++prefix=`pkg-config --variable prefix esound`
++exec_prefix=`pkg-config --variable exec_prefix esound`
+ exec_prefix_set=no
+ 
+ usage="\
+@@ -39,32 +36,13 @@
+       echo $exec_prefix
+       ;;
+     --version)
+-      echo @ESD_VERSION@
++      pkg-config --modversion esound
+       ;;
+     --cflags)
+-      if test @includedir@ != /usr/include ; then
+-        includes=-I@includedir@
+-        for i in $audiofile_cflags ; do
+-          if test $i = -I@includedir@ ; then
+-            includes=""
+-          fi
+-        done      
+-      fi
+-      echo $includes $audiofile_cflags
++      pkg-config --cflags esound
+       ;;
+     --libs)
+-      my_audiofile_libs=
+-      libdirs=-L@libdir@
+-      for i in $audiofile_libs ; do
+-        if test $i != -L@libdir@ ; then
+-          if test -z "$my_audiofile_libs" ; then
+-            my_audiofile_libs="$i"
+-          else
+-            my_audiofile_libs="$my_audiofile_libs $i"
+-          fi
+-        fi
+-      done
+-      echo $libdirs -lesd $my_audiofile_libs @LIBS@
++      pkg-config --libs esound
+       ;;
+     *)
+       echo "${usage}" 1>&2
diff --git a/esound.spec b/esound.spec
index 98f3f3a..f1aef40 100644
--- a/esound.spec
+++ b/esound.spec
@@ -2,7 +2,7 @@
 Summary: Allows several audio streams to play on a single audio device.
 Name:      esound
 Version:   0.2.36
-Release: 2.2.2
+Release: 3
 Epoch: 1
 License: GPL
 URL: ftp://ftp.gnome.org/pub/GNOME/sources/esound
@@ -11,7 +11,7 @@ Source0:   esound-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Patch0: esound-0.2.19-noerrors.patch
 Patch2: esound-0.2.35-64bit_install.patch
-Patch3: esound-0.2.36-link.patch
+Patch3: esound-multilib.patch
 BuildRequires: docbook-utils, audiofile-devel
 BuildRequires: alsa-lib-devel
 
@@ -41,7 +41,7 @@ other resources needed to develop EsounD applications.
 
 %patch0 -p1 -b .noerrors
 %patch2 -p1 -b .64bit
-%patch3 -p1
+%patch3 -p1 -b .multilib
 
 %build
 %configure
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Jul 27 2006 Matthias Clasen <mclasen@redhat.com> - 1:0.2.36-3
+- fix multilib conflicts
+
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1:0.2.36-2.2.2
 - rebuild