rpms/mikmod/F-7 libmikmod-info.patch, NONE, 1.1 mikmod.spec, 1.35, 1.36

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/mikmod/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv887

Modified Files:
	mikmod.spec 
Added Files:
	libmikmod-info.patch 
Log Message:
* Mon Feb 18 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 3.2.2-6
- Fix MikMod_InfoLoader() and MikMod_InfoDriver() functions, fixing mikmod -n
  output


libmikmod-info.patch:

--- NEW FILE libmikmod-info.patch ---
diff -up libmikmod-3.2.0-beta2/playercode/mdriver.c~ libmikmod-3.2.0-beta2/playercode/mdriver.c
--- libmikmod-3.2.0-beta2/playercode/mdriver.c~	2008-02-18 22:34:33.000000000 +0100
+++ libmikmod-3.2.0-beta2/playercode/mdriver.c	2008-02-18 22:34:33.000000000 +0100
@@ -185,11 +185,12 @@ MIKMODAPI CHAR* MikMod_InfoDriver(void)
 
 	if(len)
 		if((list=_mm_malloc(len*sizeof(CHAR)))) {
+			char *_list = list;
 			list[0]=0;
 			/* list all registered device drivers : */
 			for(t=1,l=firstdriver;l;l=l->next,t++)
-				sprintf(list,(l->next)?"%s%2d %s\n":"%s%2d %s",
-				    list,t,l->Version);
+				_list += sprintf(_list,(l->next)?"%2d %s\n":"%2d %s",
+						 t,l->Version);
 		}
 	MUTEX_UNLOCK(lists);
 	return list;
diff -up libmikmod-3.2.0-beta2/playercode/mloader.c~ libmikmod-3.2.0-beta2/playercode/mloader.c
--- libmikmod-3.2.0-beta2/playercode/mloader.c~	2008-02-18 22:36:55.000000000 +0100
+++ libmikmod-3.2.0-beta2/playercode/mloader.c	2008-02-18 22:36:55.000000000 +0100
@@ -67,10 +67,11 @@ MIKMODAPI CHAR* MikMod_InfoLoader(void)
 
 	if(len)
 		if((list=_mm_malloc(len*sizeof(CHAR)))) {
+			char *_list = list;
 			list[0]=0;
 			/* list all registered module loders */
 			for(l=firstloader;l;l=l->next)
-				sprintf(list,(l->next)?"%s%s\n":"%s%s",list,l->version);
+				_list += sprintf(_list,(l->next)?"%s\n":"%s",l->version);
 		}
 	MUTEX_UNLOCK(lists);
 	return list;


Index: mikmod.spec
===================================================================
RCS file: /cvs/extras/rpms/mikmod/F-7/mikmod.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mikmod.spec	18 Feb 2008 16:14:40 -0000	1.35
+++ mikmod.spec	18 Feb 2008 21:57:09 -0000	1.36
@@ -3,7 +3,7 @@
 Summary: A MOD music file player
 Name: mikmod
 Version: 3.2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2 and LGPLv2+
 Group: Applications/Multimedia
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -16,6 +16,7 @@
 Patch2:  libmikmod-64bit.patch
 Patch3:  libmikmod-strip-lib.patch
 Patch4:  mikmod-3.1.6-multilib.patch
+Patch5:  libmikmod-info.patch
 
 %description
 MikMod is one of the best and most well known MOD music file players
@@ -46,25 +47,27 @@
 %patch2 -p1 -b .64bit
 %patch3 -p1 -b .lib-strip
 %patch4 -p1 -b .multi
+%patch5 -p1 -b .info
 
 %build
-rm -rf $RPM_BUILD_ROOT
 pushd libmikmod-%{lversion}
 %configure
-make install DESTDIR=$RPM_BUILD_ROOT
+make
 popd
 
 # Trick it into compiling while libmikmod is not installed...
-export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir}:$LD_LIBRARY_PATH
-perl -pi -e "s,-lmikmod,-I$RPM_BUILD_ROOT%{_prefix}/include -L$RPM_BUILD_ROOT%{_libdir} -lmikmod,g" libmikmod-%{lversion}/libmikmod-config
-export LIBMIKMOD_CONFIG=`pwd`/libmikmod-%{lversion}/libmikmod-config
-%configure \
-	--with-libmikmod-prefix=$RPM_BUILD_ROOT%{_prefix} \
-	--with-libmikmod-exec-prefix=$RPM_BUILD_ROOT%{_bindir} \
-	--disable-libmikmodtest
-make CFLAGS="$RPM_OPT_FLAGS `libmikmod-%{lversion}/libmikmod-config --cflags`"
+export LD_LIBRARY_PATH=`pwd`/libmikmod-%{lversion}/libmikmod/.libs:$LD_LIBRARY_PATH
+cp -a libmikmod-%{lversion}/libmikmod-config .
+perl -pi -e "s,-lmikmod,-L`pwd`/libmikmod-%{lversion}/libmikmod/.libs -lmikmod,g" libmikmod-config
+export LIBMIKMOD_CONFIG=`pwd`/libmikmod-config
+%configure --disable-libmikmodtest --with-libmikmod-prefix=`pwd`/libmikmod-%{lversion}
+make
 
 %install
+rm -rf $RPM_BUILD_ROOT
+pushd libmikmod-%{lversion}
+make install DESTDIR=$RPM_BUILD_ROOT
+popd
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 find $RPM_BUILD_ROOT | grep "\\.la$" | xargs rm -f
@@ -104,6 +107,10 @@
 %{_mandir}/man1/libmikmod-config*
 
 %changelog
+* Mon Feb 18 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 3.2.2-6
+- Fix MikMod_InfoLoader() and MikMod_InfoDriver() functions, fixing mikmod -n
+  output
+
 * Mon Feb 18 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 3.2.2-5
 - Add BuildRequires esound-devel, so that the esd output driver gets build
 - Replace completely braindead (hint to author, drink coffee first, then code)
@@ -113,6 +120,8 @@
   esd emulation) alsa is not supported, this requires a rewrite of the mikmod
   alsa code which was written for alsa-0.5 and never updated for the new alsa
   0.9/1.0 api
+- Do not do library make install in %%build, move it to %%install, this fixes
+  building with the new rpm-check-buildroot build-check
 
 * Thu Aug 23 2007 Jindrich Novy <jnovy at redhat.com> 3.2.2-3
 - update License