From 89af7f2ab12e57a332eb04a5784f65754c3cd1c7 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Mon, 24 Dec 2007 03:40:40 +0000
Subject: [PATCH] - fix multilib conflicts (#340591)

---
 akode-2.0.2-multilib.patch | 65 ++++++++++++++++++++++++++++++++++++++
 akode.spec                 |  9 +++++-
 2 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 akode-2.0.2-multilib.patch

diff --git a/akode-2.0.2-multilib.patch b/akode-2.0.2-multilib.patch
new file mode 100644
index 0000000..c3832a9
--- /dev/null
+++ b/akode-2.0.2-multilib.patch
@@ -0,0 +1,65 @@
+diff -up /dev/null akode-2.0.2/akode/akode.pc.in
+--- /dev/null	2007-12-13 13:41:14.965729569 -0600
++++ akode-2.0.2/akode/akode.pc.in	2007-12-23 21:32:59.000000000 -0600
+@@ -0,0 +1,11 @@
++prefix=@prefix@
++exec_prefix=@prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: akode 
++Description: aKode is a simple audio-decoding frame-work 
++Version: 2.0.2 
++Libs: -L${libdir} -lakode
++Cflags: -I${includedir}
++
+diff -up akode-2.0.2/akode/configure.in.in.multilib akode-2.0.2/akode/configure.in.in
+--- akode-2.0.2/akode/configure.in.in.multilib	2007-12-23 21:32:59.000000000 -0600
++++ akode-2.0.2/akode/configure.in.in	2007-12-23 21:32:59.000000000 -0600
+@@ -1,5 +1,6 @@
+ dnl don't remove the below
+ dnl AC_OUTPUT(akode/akode-config)
++dnl AC_OUTPUT(akode/akode.pc)
+ 
+ AM_CONFIG_HEADER(akode/lib/akode_export.h)
+ 
+diff -up akode-2.0.2/akode/akode-config.in.multilib akode-2.0.2/akode/akode-config.in
+--- akode-2.0.2/akode/akode-config.in.multilib	2007-04-06 08:16:47.000000000 -0500
++++ akode-2.0.2/akode/akode-config.in	2007-12-23 21:37:40.000000000 -0600
+@@ -15,9 +15,8 @@ EOH
+ }
+ 
+ prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-includedir=@includedir@
++akode_libs="`pkg-config --libs akode`"
++akode_cflags="`pkg-config --cflags akode`"
+ 
+ flags=""
+ 
+@@ -29,10 +28,10 @@ while test $# -gt 0
+ do
+   case $1 in
+     --libs)
+-	  flags="$flags -L$libdir -lakode"
++	  flags="$flags $akode_libs"
+ 	  ;;
+     --cflags)
+-	  flags="$flags -I$includedir"
++	  flags="$flags $akode_cflags"
+ 	  ;;
+     --version)
+ 	  echo 2.0.2
+diff -up akode-2.0.2/akode/Makefile.am.multilib akode-2.0.2/akode/Makefile.am
+--- akode-2.0.2/akode/Makefile.am.multilib	2005-07-14 09:27:18.000000000 -0500
++++ akode-2.0.2/akode/Makefile.am	2007-12-23 21:32:59.000000000 -0600
+@@ -1,3 +1,8 @@
+ bin_SCRIPTS = akode-config
+ 
+ SUBDIRS= lib plugins akodeplay
++
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = akode.pc
++
++EXTRA_DIST = akode.pc.in
diff --git a/akode.spec b/akode.spec
index 3f69356..9fe261d 100644
--- a/akode.spec
+++ b/akode.spec
@@ -2,7 +2,7 @@
 Summary: Audio-decoding framework 
 Name:	 akode 
 Version: 2.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: LGPLv2+
 Group: 	 System Environment/Libraries
@@ -12,6 +12,7 @@ Source0: http://www.kde-apps.org/CONTENT/content-files/30375-akode-%{version}.ta
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: akode-pulseaudio.patch
+Patch2: akode-2.0.2-multilib.patch
 
 %if 0%{?fedora} > 4
 %define _with_jack --with-jack
@@ -48,6 +49,7 @@ aKode also has the following audio outputs:
 Summary: Headers for developing programs that will use %{name} 
 Group:   Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
 %description devel
 %{summary}.
 
@@ -80,6 +82,7 @@ Requires: %{name} = %{version}-%{release}
 %setup -q -n %{name}-%{version}%{?beta}
 
 %patch1 -p1 -b .pulseaudio
+%patch2 -p1 -b .multilib
 
 #[ ! -f configure ] && \
 make -f Makefile.cvs
@@ -142,6 +145,7 @@ rm -rf %{buildroot}
 %{_bindir}/akode-config
 %{_includedir}/*
 %{_libdir}/libakode.so
+%{_libdir}/pkgconfig/*.pc
 
 %if "%{?_with_jack:1}" == "1"
 %files jack 
@@ -162,6 +166,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Dec 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.2-2
+- fix multilib conflicts (#340591)
+
 * Sun Dec 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.2-1
 - akode-2.0.2