rpms/mikmod/F-8 mikmod.spec,1.38,1.39

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	mikmod.spec 
Log Message:
* 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)
  esd non blocking patch with one that actually works. This fixes using mikmod
  with pulseaudio (bz 247865)
- Note: this makes the 2 supported output devices oss and esd (and pulseaudio's
  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



Index: mikmod.spec
===================================================================
RCS file: /cvs/extras/rpms/mikmod/F-8/mikmod.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- mikmod.spec	18 Feb 2008 19:03:12 -0000	1.38
+++ mikmod.spec	18 Feb 2008 21:07:48 -0000	1.39
@@ -55,10 +55,11 @@
 
 # Trick it into compiling while libmikmod is not installed...
 export LD_LIBRARY_PATH=`pwd`/libmikmod-%{lversion}/libmikmod/.libs:$LD_LIBRARY_PATH
-perl -pi -e "s,-lmikmod,-I`pwd`/libmikmod-%{lversion}/include -L`pwd`/libmikmod-%{lversion}/libmikmod/.libs -lmikmod,g" libmikmod-%{lversion}/libmikmod-config
-export LIBMIKMOD_CONFIG=`pwd`/libmikmod-%{lversion}/libmikmod-config
-%configure --disable-libmikmodtest
-make CFLAGS="$RPM_OPT_FLAGS `libmikmod-%{lversion}/libmikmod-config --cflags`"
+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