rpms/timidity++/devel timidity++.spec,1.20,1.21

[Jindrich Novy (jnovy)]

Author: jnovy

Update of /cvs/extras/rpms/timidity++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2458

Modified Files:
	timidity++.spec 
Log Message:
add the ppc64 build fixes again for now 



Index: timidity++.spec
===================================================================
RCS file: /cvs/extras/rpms/timidity++/devel/timidity++.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- timidity++.spec	25 Jan 2008 10:31:09 -0000	1.20
+++ timidity++.spec	25 Jan 2008 10:49:19 -0000	1.21
@@ -27,7 +27,9 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: arts-devel esound-devel alsa-lib-devel ncurses-devel gtk2-devel
 BuildRequires: libao-devel libvorbis-devel flac-devel speex-devel
+%ifnarch ppc64
 BuildRequires: jack-audio-connection-kit-devel
+%endif
 BuildRequires: desktop-file-utils
 Requires: %{name}-patches = %{version}-%{release}, hicolor-icon-theme
 
@@ -74,14 +76,18 @@
 export EXTRACFLAGS="$RPM_OPT_FLAGS"
 %configure --enable-dynamic --disable-dependency-tracking \
   --enable-interface=ncurses,vt100,alsaseq,server,network,gtk \
+%ifnarch ppc64
   --enable-audio=oss,arts,alsa,esd,ao,jack,vorbis,speex,flac
-make
+%else
+  --enable-audio=oss,arts,alsa,esd,ao,vorbis,speex,flac
+%endif
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT %{?_smp_mflags}
+make install DESTDIR=$RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/timidity $RPM_BUILD_ROOT/etc
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/timidity.cfg
@@ -144,7 +150,6 @@
   - enable parallel build
   - preserve timestamps, tar unpacking is no more verbose
   - add docs
-- try to avoid the ppc64 build hacks
 
 * Tue Dec 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.13.2-6
 - Disable building of the jack output on powerpc64, as that mysteriously fails