- needs deps update for modular xorg

[packages/bochs.git] / bochs.spec

diff --git a/bochs.spec b/bochs.spec
index ef72af9b9c5f772fcc9dc9748379320d2eaa74b2..23dfea8fdf0df09b93b7e6c194839151fa8027e9 100644 (file)
--- a/bochs.spec
+++ b/bochs.spec
@@ -7,27 +7,27 @@
 Summary:       Portable x86 PC Emulator
 Summary(pl):   Przeno¶ny emulator x86 PC
 Name:          bochs
-Version:       2.2
-Release:       2
+Version:       2.3
+Release:       0.1
 License:       GPL
 Group:         Applications/Emulators
 Source0:       http://dl.sourceforge.net/bochs/%{name}-%{version}.tar.gz
-# Source0-md5: 2f0d82bda2193242a2d7ece1917016c1
-Patch0:                %{name}-instrumentation.patch
+# Source0-md5: 100c02fbcd402c2b4862d0251be539fd
+Patch0:                %{name}-wx.patch
 URL:           http://bochs.sourceforge.net/
 BuildRequires: SDL-devel
-BuildRequires: XFree86-devel
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: docbook-dtd41-sgml
-BuildRequires: gtk+2-devel
+BuildRequires: gtk+2-devel >= 1:2.0
 BuildRequires: libstdc++-devel
 BuildRequires: ncurses-devel
+BuildRequires: pkgconfig
 %{?with_svga:BuildRequires:    svgalib-devel}
 BuildRequires: wxGTK2-devel
+#BuildRequires:        xorg-???-devel
 BuildRequires: zlib-devel
-BuildRequires: pkgconfig
-Requires:      XFree86-fonts
+#Requires:     xorg-font-???
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -63,7 +63,6 @@ WXGTK2CONFIG=""
 
 %configure \
        WX_CONFIG=$WXGTK2CONFIG \
-       --enable-config-interface \
        --enable-new-pit \
        --enable-plugins \
        --enable-cpu-level=6 \
@@ -113,7 +112,7 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT \
        docdir=%{_docdir}/%{name}-%{version}
 
-mv -f $RPM_BUILD_ROOT%{_datadir}/bochs/VGABIOS*{LICENSE,README,latest} \
+mv -f $RPM_BUILD_ROOT%{_datadir}/bochs/VGABIOS*{LICENSE,README} \
        $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 cp -f TESTFORM.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}