rpms/libmikmod/F-12 libmikmod-multilib.patch, 1.1, 1.2 libmikmod.spec, 1.13, 1.14

[Jindrich Novy]

Author: jnovy

Update of /cvs/pkgs/rpms/libmikmod/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20002

Modified Files:
	libmikmod-multilib.patch libmikmod.spec 
Log Message:
* Thu Dec 03 2009 Jindrich Novy <jnovy at redhat.com> 3.2.0-10.beta2
- fix build on PPC, correctly link against -lm there


libmikmod-multilib.patch:
 configure           |    2 +-
 libmikmod-config.in |   16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

Index: libmikmod-multilib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libmikmod/F-12/libmikmod-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libmikmod-multilib.patch	24 Oct 2007 09:48:31 -0000	1.1
+++ libmikmod-multilib.patch	3 Dec 2009 10:11:07 -0000	1.2
@@ -1,6 +1,19 @@
---- 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 @@
+diff -up libmikmod-3.2.0-beta2/configure.multilib libmikmod-3.2.0-beta2/configure
+--- libmikmod-3.2.0-beta2/configure.multilib	2004-02-20 23:08:30.000000000 +0100
++++ libmikmod-3.2.0-beta2/configure	2009-12-03 11:06:48.000000000 +0100
+@@ -6360,7 +6360,7 @@ ac_link='${CC-cc} -o conftest${ac_exeext
+ 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/'`
+diff -up libmikmod-3.2.0-beta2/libmikmod-config.in.multilib libmikmod-3.2.0-beta2/libmikmod-config.in
+--- libmikmod-3.2.0-beta2/libmikmod-config.in.multilib	2004-01-21 02:36:34.000000000 +0100
++++ libmikmod-3.2.0-beta2/libmikmod-config.in	2009-12-03 11:07:16.000000000 +0100
+@@ -5,7 +5,7 @@ exec_prefix=@exec_prefix@
  exec_prefix_set=no
  
  usage="\
@@ -9,7 +22,7 @@
  
  if test $# -eq 0 ; then
  	echo "${usage}" 1>&2
-@@ -49,9 +49,21 @@
+@@ -49,8 +49,20 @@ while test $# -gt 0 ; do
  		echo @LIB_LDADD@
  	;;
  	--libs)
@@ -18,27 +31,16 @@
 +    		else
 +    		    libdir=-L${exec_prefix}/lib
 +    		fi
-+		echo $libdir -lmikmod @LIBRARY_LIB@
++		echo $libdir -lmikmod -lm @LIBRARY_LIB@
 +	;;
 +	--libs32)
  		libdir=-L${exec_prefix}/lib
- 		echo $libdir -lmikmod @LIBRARY_LIB@
- 	;;
+-		echo $libdir -lmikmod @LIBRARY_LIB@
++		echo $libdir -lmikmod -lm @LIBRARY_LIB@
++	;;
 +	--libs64)
 +		libdir=-L${exec_prefix}/lib64
-+		echo $libdir -lmikmod @LIBRARY_LIB@
-+	;;
++		echo $libdir -lmikmod -lm @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/pkgs/rpms/libmikmod/F-12/libmikmod.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- libmikmod.spec	23 Nov 2009 11:06:16 -0000	1.13
+++ libmikmod.spec	3 Dec 2009 10:11:07 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: A MOD music file player library
 Name: libmikmod
 Version: 3.2.0
-Release: 9.beta2%{?dist}
+Release: 10.beta2%{?dist}
 License: GPLv2 and LGPLv2+
 Group: Applications/Multimedia
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -86,6 +86,9 @@ fi
 %{_mandir}/man1/libmikmod-config*
 
 %changelog
+* Thu Dec 03 2009 Jindrich Novy <jnovy at redhat.com> 3.2.0-10.beta2
+- fix build on PPC, correctly link against -lm there
+
 * Mon Nov 23 2009 Hans de Goede <hdegoede at redhat.com> 3.2.0-9.beta2
 - Fix CVE-2007-6720 fix, it causes mods to sound wrong, and even causes
   crashes under certain circumstances (#540234), see: