rpms/bochs/devel bochs.spec,1.14,1.15

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	bochs.spec 
Log Message:
Don't try to build svgalib support on PPC (oops again)


Index: bochs.spec
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/bochs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- bochs.spec	16 Feb 2006 20:55:37 -0000	1.14
+++ bochs.spec	16 Feb 2006 23:39:38 -0000	1.15
@@ -21,7 +21,9 @@
 BuildRequires:  ncurses-devel
 BuildRequires:  SDL-devel
 BuildRequires:  wxGTK-devel
+%ifarch %{ix86} x86_64
 BuildRequires:  svgalib-devel
+%endif
 %if %{with debugger}
 BuildRequires:  readline-devel
 %endif
@@ -62,14 +64,14 @@
   -e 's|/usr/local/share/|%{_datadir}/|' \
   doc/man/*.*
 
-# Fix build error with g++ 4.1.0
-sed -i -e '/#ifndef PARANOID/,/#endif/d' iodev/harddrv.h
-
 
 %build
+%ifarch %{ix86} x86_64
+ARCH_CONFIGURE_FLAGS=--with-svga
+%endif
+export CXXFLAGS="$RPM_OPT_FLAGS -DPARANOID"
 # Note: the CPU level, MMX et al affect what the emulator will emulate, they
 # are not properties of the build target architecture.
-export CXXFLAGS="$RPM_OPT_FLAGS -DPARANOID"
 %configure \
   --enable-plugins \
   --enable-ne2000 \
@@ -86,7 +88,7 @@
   --with-rfb \
   --with-sdl \
   --with-wx \
-  --with-svga
+  $ARCH_CONFIGURE_FLAGS
 
 make %{?_smp_mflags}
 make unpack_dlx
@@ -132,11 +134,12 @@
 %changelog
 * Wed Feb 15 2006 Hans de Goede <j.w.r.degoede at hhs.nl> - 2.2.6-1
 - New upstream version 2.2.6
+- Rebuild for new gcc4.1 and glibc
 - Remove --enable-pae as that requires a CPU level of 6 with the new version
 - Remove a few configure switches which are identical to the
   upstream defaults and thus don't do anything
 - Add --enable-clgd54xx
-- Add --with-svga which adds support for svgalib as display
+- Add --with-svga which adds support for svgalib as display (x86(_64) only)
 - Fix compile with wxGTK-2.6 and unconditionalize wxGTK build
 
 * Fri Dec 16 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.2.1-2