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

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mikmod.spec	18 Feb 2008 16:11:26 -0000	1.37
+++ mikmod.spec	18 Feb 2008 19:03:12 -0000	1.38
@@ -48,23 +48,23 @@
 %patch4 -p1 -b .multi
 
 %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 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 \
-	--with-libmikmod-prefix=$RPM_BUILD_ROOT%{_prefix} \
-	--with-libmikmod-exec-prefix=$RPM_BUILD_ROOT%{_bindir} \
-	--disable-libmikmodtest
+%configure --disable-libmikmodtest
 make CFLAGS="$RPM_OPT_FLAGS `libmikmod-%{lversion}/libmikmod-config --cflags`"
 
 %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
@@ -113,6 +113,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