rpms/SheepShaver/F-18 SheepShaver.spec,1.12,1.13

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/free/rpms/SheepShaver/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2942

Modified Files:
	SheepShaver.spec 
Log Message:
* Sun Mar 10 2013 Hans de Goede <j.w.r.degoede at gmail.com> - 2.3-0.12.20130310
- New upstream: http://sheepsaver.cebix.net/
- Uses github, no source tarbals :| Update to todays git master (bbc0af47)
- Modernize spec
- Fix FTBFS (since F-11 !)
- Switch from esound (deprecated / obsolete) to SDL for sound output



Index: SheepShaver.spec
===================================================================
RCS file: /cvs/free/rpms/SheepShaver/F-18/SheepShaver.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SheepShaver.spec	12 Mar 2013 12:16:30 -0000	1.12
+++ SheepShaver.spec	12 Mar 2013 14:17:54 -0000	1.13
@@ -23,7 +23,7 @@
 Requires:       hicolor-icon-theme
 # Other archs need an instruction skipper on well-known invalid
 # memory references (e.g. illegal writes to ROM).
-ExclusiveArch:  i686 x86_64 ppc
+ExclusiveArch:  %{ix86} x86_64 ppc
 
 %description
 SheepShaver is a MacOS run-time environment that allows you to run classic
@@ -50,7 +50,11 @@
 pushd SheepShaver/src/Unix
 NO_CONFIGURE=1 ./autogen.sh
 export CXXFLAGS="$RPM_OPT_FLAGS -fpermissive"
+# Note no jit on i686 as it fails to build with gcc-4.7 (fixed in f19/gcc-4.8)
 %configure --datadir=%{_sysconfdir} --enable-ppc-emulator=yes \
+%ifarch %{ix86}
+    --disable-jit \
+%endif
     --with-mon=../../../cxmon-%{mon_version}/src \
     --disable-xf86-dga --enable-sdl-audio --with-bincue
 make %{?_smp_mflags}