rpms/libmikmod/devel libmikmod-multilib.patch, NONE, 1.1 libmikmod.spec, 1.1, 1.2

[Jindrich Novy (jnovy)]

Author: jnovy

Update of /cvs/extras/rpms/libmikmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30634

Modified Files:
	libmikmod.spec 
Added Files:
	libmikmod-multilib.patch 
Log Message:
add multilib patch

libmikmod-multilib.patch:

--- NEW FILE libmikmod-multilib.patch ---
--- libmikmod-3.1.11/libmikmod-config.in.old	2004-01-21 18:43:52.000000000 +0100
+++ 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
--- libmikmod-3.1.11/configure.old	2004-01-21 18:43:52.000000000 +0100
+++ 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: libmikmod.spec
===================================================================
RCS file: /cvs/extras/rpms/libmikmod/devel/libmikmod.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libmikmod.spec	24 Oct 2007 07:52:21 -0000	1.1
+++ libmikmod.spec	24 Oct 2007 09:48:31 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: A MOD music file player library
 Name: libmikmod
 Version: 3.1.11
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2 and LGPLv2+
 Group: Applications/Multimedia
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -14,6 +14,7 @@
 Patch2:  libmikmod-64bit.patch
 Patch3:  libmikmod-strip-lib.patch
 Patch4:  libmikmod-rpath.patch
+Patch5:  libmikmod-multilib.patch
 
 %description
 libmikmod is a library used by the mikmod MOD music file player for
@@ -36,6 +37,7 @@
 %patch2 -p1 -b .64bit
 %patch3 -p1 -b .lib-strip
 %patch4 -p1 -b .rpath
+%patch5 -p1 -b .multilib
 
 %build
 %configure
@@ -77,6 +79,9 @@
 %{_mandir}/man1/libmikmod-config*
 
 %changelog
+* Wed Oct 24 2007 Jindrich Novy <jnovy at redhat.com> 3.1.11-3
+- add multilib patch
+
 * Tue Oct 23 2007 Jindrich Novy <jnovy at redhat.com> 3.1.11-2
 - update description
 - add smp_flags to make