rpms/mikmod/devel mikmod-3.1.6-multilib.patch, NONE, 1.1 mikmod.spec, 1.27, 1.28

[fedora-cvs-commits at redhat.com]

Author: stransky

Update of /cvs/dist/rpms/mikmod/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15663

Modified Files:
	mikmod.spec 
Added Files:
	mikmod-3.1.6-multilib.patch 
Log Message:
fixed multilib issue (#192732)

mikmod-3.1.6-multilib.patch:
 configure           |    2 +-
 libmikmod-config.in |   14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

--- NEW FILE mikmod-3.1.6-multilib.patch ---
--- mikmod-3.1.6/libmikmod-3.1.11/libmikmod-config.in.old	2004-01-21 18:43:52.000000000 +0100
+++ mikmod-3.1.6/libmikmod-3.1.11/libmikmod-config.in	2006-05-31 17:36:12.000000000 +0200
@@ -5,7 +5,7 @@
 exec_prefix_set=no
 
 usage="\
-Usage: libmikmod-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--ldadd]"
+Usage: libmikmod-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--libs32] [--libs64] [--cflags] [--ldadd]"
 
 if test $# -eq 0 ; then
 	echo "${usage}" 1>&2
@@ -49,9 +49,21 @@
 		echo @LIB_LDADD@
 	;;
 	--libs)
+		if [ -d /usr/lib64 ]; then
+    		    libdir=-L${exec_prefix}/lib64
+    		else
+    		    libdir=-L${exec_prefix}/lib
+    		fi
+		echo $libdir -lmikmod @LIBRARY_LIB@
+	;;
+	--libs32)
 		libdir=-L${exec_prefix}/lib
 		echo $libdir -lmikmod @LIBRARY_LIB@
 	;;
+	--libs64)
+		libdir=-L${exec_prefix}/lib64
+		echo $libdir -lmikmod @LIBRARY_LIB@
+	;;
 	*)
 		echo "${usage}" 1>&2
 		exit 1
--- mikmod-3.1.6/libmikmod-3.1.11/configure.old	2004-01-21 18:43:52.000000000 +0100
+++ mikmod-3.1.6/libmikmod-3.1.11/configure	2006-05-31 17:37:10.000000000 +0200
@@ -6390,7 +6390,7 @@
 cross_compiling=$ac_cv_prog_cc_cross
 
     ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
-    ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
+    ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs | sed -r 's|-L[^ ]+||g'`
 
     esd_major_version=`$ESD_CONFIG $esd_args --version | \
            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`


Index: mikmod.spec
===================================================================
RCS file: /cvs/dist/rpms/mikmod/devel/mikmod.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- mikmod.spec	11 Feb 2006 04:36:06 -0000	1.27
+++ mikmod.spec	31 May 2006 15:52:45 -0000	1.28
@@ -4,7 +4,7 @@
 Summary: A MOD music file player.
 Name: mikmod
 Version: 3.1.6
-Release: 36.2.1
+Release: 37
 License: GPL/LGPL
 Group: Applications/Multimedia
 Prereq: /sbin/ldconfig
@@ -23,6 +23,7 @@
 Patch6:  libmikmod-strip-lib.patch
 Patch7:  mikmod-3.1.6-security.patch
 Patch8:  mikmod-3.1.6-tar.patch
+Patch9:  mikmod-3.1.6-multilib.patch
 Obsoletes: tracker
 
 %description
@@ -58,6 +59,7 @@
 %patch6 -p1 -b .lib-strip
 %patch7 -p1 -b .sec
 %patch8 -p1 -b .tar
+%patch9 -p1 -b .multi
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -118,6 +120,9 @@
 %{_mandir}/man1/libmikmod-config*
 
 %changelog
+* Wed May 31 2006 Martin Stransky <stransky at redhat.com> 3.1.6-37
+- fixed multilib issue (#192732), thx. to Radek Biba
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.1.6-36.2.1
 - bump again for double-long bug on ppc(64)