- needs deps update for modular xorg

[packages/bochs.git] / bochs.spec

diff --git a/bochs.spec b/bochs.spec
index 2c5a84060ffef076e8f7cd869f7f25ba2c475e17..23dfea8fdf0df09b93b7e6c194839151fa8027e9 100644 (file)
--- a/bochs.spec
+++ b/bochs.spec
@@ -1,29 +1,33 @@
 # TODO:
 #      - more subpackages (plugins)
-
-%define        pre     pre3
+#
+# Conditional build:
+%bcond_without svga    # without svgalib support
+#
 Summary:       Portable x86 PC Emulator
 Summary(pl):   Przeno¶ny emulator x86 PC
 Name:          bochs
-Version:       2.1
-Release:       0.%{pre}.1
+Version:       2.3
+Release:       0.1
 License:       GPL
 Group:         Applications/Emulators
-Source0:       http://dl.sourceforge.net/%{name}/%{name}-%{version}.%{pre}.tar.gz
-# Source0-md5: d9cf6b0373c40e636368f73859544269
-Patch0:                %{name}-ncurses.patch
-Patch1:                %{name}-wxGTK.patch
+Source0:       http://dl.sourceforge.net/bochs/%{name}-%{version}.tar.gz
+# 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 >= 1:2.0
 BuildRequires: libstdc++-devel
 BuildRequires: ncurses-devel
-BuildRequires: svgalib-devel
-BuildRequires: wxGTK-devel
+BuildRequires: pkgconfig
+%{?with_svga:BuildRequires:    svgalib-devel}
+BuildRequires: wxGTK2-devel
+#BuildRequires:        xorg-???-devel
 BuildRequires: zlib-devel
-Requires:      XFree86-fonts
+#Requires:     xorg-font-???
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -34,21 +38,31 @@ Windows '95, Minix 2.0, and other OS's, all on your workstation.
 %description -l pl
 Bochs jest przeno¶nym emulatorem x86 PC emuluj±cym wystarczaj±co du¿o
 architektury procesora x86 oraz hardware'u AT i BIOS-u ¿eby uruchomiæ
-DOS-a, Windows 95, Minix 2.0 i inne systemu operacyjne, wszystkie na
+DOS-a, Windows 95, Minix 2.0 i inne systemy operacyjne, wszystkie na
 Twoim komputerze.
 
 %prep
-%setup -q -n %{name}-%{version}.%{pre}
-%patch0        -p1
-%patch1        -p1
+%setup -q
+%patch0 -p1
 
 %build
+cp -f /usr/share/automake/config.sub .
 %{__autoconf}
+CXXFLAGS="%{rpmcflags} -I/usr/include/ncurses `pkg-config gdk-2.0 --cflags`"
+LDFLAGS=`pkg-config gdk-2.0 --libs`
+export CXXFLAGS LDFLAGS
 # --enable-x86-64 (not supported together with --enable-sep)
 # --enable-debugger --enable-iodebug --enable-x86-debugger (slowdowns emulation)
 # --enable-apic (no need to specify, configure will choose best depending on nr cpus)
+
+WXGTK2CONFIG=""
+[ -x /usr/bin/wx-gtk2-ansi-config ] && WXGTK2CONFIG=wx-gtk2-ansi-config
+[ -x /usr/bin/wxgtk-2.4-config ] && WXGTK2CONFIG=wxgtk-2.4-config
+
+[ "x$WXGTK2CONFIG" == "x" ] && echo "Can't find wxGTK2 config file!" && exit 1
+
 %configure \
-       --enable-config-interface \
+       WX_CONFIG=$WXGTK2CONFIG \
        --enable-new-pit \
        --enable-plugins \
        --enable-cpu-level=6 \
@@ -84,7 +98,7 @@ Twoim komputerze.
        --with-wx \
        --with-rfb \
        --with-sdl \
-       --with-svga \
+       %{?with_svga:-with-svga} \
        --with-x11 \
        --with-term \
        --with-rfb
@@ -98,15 +112,15 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT \
        docdir=%{_docdir}/%{name}-%{version}
 
-mv -f $RPM_BUILD_ROOT%{_datadir}/bochs/VGABIOS*{LICENSE,README,latest} \
-    $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+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}
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/bochs/*fonts
-rm -f $RPM_BUILD_ROOT%{_datadir}/bochs/*pcf
+#rm -f $RPM_BUILD_ROOT%{_datadir}/bochs/*fonts
+#rm -f $RPM_BUILD_ROOT%{_datadir}/bochs/*pcf
 
-find $RPM_BUILD_ROOT -type d -name CVS | xargs rm -rf
+#find $RPM_BUILD_ROOT -type d -name CVS | xargs rm -rf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -120,7 +134,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/plugins/*.la
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/keymaps
-%attr(755,root,root) %{_datadir}/%{name}/keymaps/convertmap.pl
 %{_datadir}/%{name}/keymaps/*.map
 %{_datadir}/%{name}/*BIOS*
 %{_mandir}/man[15]/*