rpms/zynaddsubfx/devel zynaddsubfx.spec,1.4,1.5

[Anthony Green (green)]

Author: green

Update of /cvs/extras/rpms/zynaddsubfx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14308/devel

Modified Files:
	zynaddsubfx.spec 
Log Message:
Fix ppc builds again.



Index: zynaddsubfx.spec
===================================================================
RCS file: /cvs/extras/rpms/zynaddsubfx/devel/zynaddsubfx.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- zynaddsubfx.spec	2 Sep 2006 05:23:40 -0000	1.4
+++ zynaddsubfx.spec	2 Sep 2006 06:39:49 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:        Real-time software synthesizer
 Name:           zynaddsubfx
 Version:        2.2.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://zynaddsubfx.sourceforge.net
@@ -47,14 +47,19 @@
 # fix microtuning bug (no keyboard mapping being done)
 %{__perl} -p -i -e "s|tmp=Pmapping\[tx\]|Pmapping\[tx\]=tmp|g" src/Misc/Microtonal.C
 
-%ifarch ppc
+%ifarch %{ix86} x86_64 
+# We're ok.
+%else
 %{__perl} -p -i -e "s|ASM_F2I=YES|ASM_F2I=NO|g" src/Makefile.inc
 %endif
 
 cd src
 # do not use smp flags, makefile is not smp safe
+%ifarch %{ix86} x86_64 
 make AUDIOOUT=JACK CXXFLAGS="-DOS_LINUX -DALSAMIDIIN -DFFTW_VERSION_3 -DASM_F2I_YES `fltk-config --cflags`  -DJACKAUDIOOUT  `pkg-config --cflags jack` `pkg-config --cflags lash-1.0`"
-
+%else
+make AUDIOOUT=JACK CXXFLAGS="-DOS_LINUX -DALSAMIDIIN -DFFTW_VERSION_3 -DASM_F2I_NO `fltk-config --cflags`  -DJACKAUDIOOUT  `pkg-config --cflags jack` `pkg-config --cflags lash-1.0`"
+%endif
 
 # build external programs
 cd ../ExternalPrograms
@@ -143,6 +148,9 @@
 %{_datadir}/icons/hicolor/64x64/apps/zynaddsubfx.png
 
 %changelog
+* Wed Aug 30 2006 Anthony Green <green at redhat.com>  2.2.1-11
+- Fix ppc problem (in a different way).
+
 * Wed Aug 30 2006 Anthony Green <green at redhat.com>  2.2.1-10
 - Fix ppc problem.  Add perl dependency.