rpms/bochs/FC-6 bochs.spec,1.23,1.24

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/bochs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22044

Modified Files:
	bochs.spec 
Log Message:
* Wed Jul 18 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3-5
- Fix CVE-2007-2893 (bz 241799)



Index: bochs.spec
===================================================================
RCS file: /cvs/extras/rpms/bochs/FC-6/bochs.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- bochs.spec	18 Jul 2007 20:05:09 -0000	1.23
+++ bochs.spec	19 Jul 2007 17:21:12 -0000	1.24
@@ -9,15 +9,14 @@
 Source1:        http://bochs.sourceforge.net/guestos/dlxlinux4.tar.gz
 Patch0:         %{name}-nonet-build.patch
 Patch1:         %{name}-config.patch
-Patch2:         %{name}-wx28.patch
-Patch3:         %{name}-CVE-2007-2893.patch
+Patch2:         %{name}-CVE-2007-2893.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  docbook-utils
 BuildRequires:  libXt-devel
 BuildRequires:  libXpm-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  SDL-devel
-#BuildRequires:  wxGTK-devel
+BuildRequires:  wxGTK-devel
 %ifarch %{ix86} x86_64
 BuildRequires:  svgalib-devel
 %endif
@@ -66,8 +65,7 @@
 %prep
 %setup -q
 %patch0 -p0 -z .nonet
-%patch2 -p1 -z .wx28
-%patch3 -p1 -z .cve
+%patch2 -p1 -z .cve
 cp -p %{SOURCE1} .
 # Fix up some man page paths.
 sed -i \
@@ -98,7 +96,7 @@
   --with-term \
   --with-rfb \
   --with-sdl \
-  --without-wx \
+  --with-wx \
   $ARCH_CONFIGURE_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS -DPARANOID"
 
@@ -167,10 +165,6 @@
 * Wed Jul 18 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3-5
 - Fix CVE-2007-2893 (bz 241799)
 
-* Mon Dec 18 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3-4
-- rebuilt without wxGTK as wxGTK is even more broken with wxGTK 2.8 then it
-  was with 2.6
-
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.3-3
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21