- now we have svgalib on all supported archs

[packages/bochs.git] / bochs.spec

diff --git a/bochs.spec b/bochs.spec
index 2059594b45ad3a9130b86a72e5385b6424faec47..b34982e1cb9c5d46da1df18001852b8a26b76688 100644 (file)
--- a/bochs.spec
+++ b/bochs.spec
@@ -1,25 +1,29 @@
 # 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.1.1
+Release:       2
 License:       GPL
 Group:         Applications/Emulators
-Source0:       http://dl.sourceforge.net/%{name}/%{name}-%{version}.%{pre}.tar.gz
-# Source0-md5: d9cf6b0373c40e636368f73859544269
+Source0:       http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+# Source0-md5: 7b21efbe2b56cc15d110993234259b33
 Patch0:                %{name}-ncurses.patch
 URL:           http://bochs.sourceforge.net/
 BuildRequires: SDL-devel
 BuildRequires: XFree86-devel
 BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: docbook-dtd41-sgml
+BuildRequires: gtk+-devel
 BuildRequires: libstdc++-devel
 BuildRequires: ncurses-devel
-BuildRequires: svgalib-devel
+%{?with_svga:BuildRequires:    svgalib-devel}
 BuildRequires: wxGTK2-devel
 BuildRequires: zlib-devel
 Requires:      XFree86-fonts
@@ -37,10 +41,11 @@ DOS-a, Windows 95, Minix 2.0 i inne systemu operacyjne, wszystkie na
 Twoim komputerze.
 
 %prep
-%setup -q -n %{name}-%{version}.%{pre}
+%setup -q
 %patch0        -p1
 
 %build
+cp -f /usr/share/automake/config.sub .
 %{__autoconf}
 # --enable-x86-64 (not supported together with --enable-sep)
 # --enable-debugger --enable-iodebug --enable-x86-debugger (slowdowns emulation)
@@ -83,7 +88,7 @@ Twoim komputerze.
        --with-wx \
        --with-rfb \
        --with-sdl \
-       --with-svga \
+       %{?with_svga:-with-svga} \
        --with-x11 \
        --with-term \
        --with-rfb
@@ -102,10 +107,10 @@ mv -f $RPM_BUILD_ROOT%{_datadir}/bochs/VGABIOS*{LICENSE,README,latest} \
 
 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