+# TODO:
+# - more --with and --enable in configure
+
Summary: Portable x86 PC Emulator
Summary(pl): Przeno¶ny emulator x86 PC
Name: bochs
-Version: 1.2.1
+Version: 2.0
Release: 1
License: GPL
Group: Applications/Emulators
-Source0: http://prdownloads.sourceforge.net/bochs/%{name}-%{version}.tar.gz
+Source0: http://telia.dl.sourceforge.net/sourceforge/bochs/%{name}-%{version}.tar.gz
URL: http://bochs.sourceforge.net/
BuildRequires: XFree86-devel
BuildRequires: libstdc++-devel
+#vga.pcf.gz
+Requires: XFree86-fonts
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
%setup -q
%build
-%configure2_13 \
- --with-x \
- --enable-cpu-level=5 \
- --enable-vga \
- --enable-fpu \
+%configure \
--enable-cdrom \
+ --enable-cpu-level=6 \
+ --enable-vbe \
+ --with-x \
--with-x11
+
%{__make}
-cd font
-#for i in vga.bdf hercules.bdf;
-#do
-# bdftopcf $i -o `basename $i .bdf`.pcf
-#done;
-# vga.pcf has moved to XFree86-fonts
-bdftopcf hercules.bdf -o hercules.pcf
-cd ..
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/{%{_bindir},%{_datadir}/bochs/bios,%{_datadir}/fonts/misc,%{_datadir}/man/man1}
-install bochs install-x11-fonts bximage $RPM_BUILD_ROOT/%{_bindir}
-install bios/BIOS-bochs-latest* bios/VGABIOS-elpin-2.40 $RPM_BUILD_ROOT%{_datadir}/bochs/bios
-install doc/man/* $RPM_BUILD_ROOT%{_datadir}/man/man1
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT \
+ docdir=%{_docdir}/%{name}-%{version}
-mv -f .bochsrc .brc
-echo "Example .bochrc file - put it into selected directory and modify" \
- "path to images" >.bochsrc
-sed -e 's#bios#%{_datadir}/bochs/bios#g' <.brc >>.bochsrc
+mv -f $RPM_BUILD_ROOT%{_datadir}/bochs/VGABIOS*{LICENSE,README,latest} \
+ $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-gzip -9nf docs-html/* bios/VGABIOS-elpin-LICENSE .bochsrc font/*.pcf CHANGES TESTFORM.txt
+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
-install font/*.pcf* $RPM_BUILD_ROOT%{_datadir}/fonts/misc
+DIRS=`find $RPM_BUILD_ROOT -type d -name CVS`
+for DIR in $DIRS
+do
+ rm -rf $DIR
+done
%clean
rm -rf $RPM_BUILD_ROOT
-%post
-if [ -x /usr/X11R6/bin/mkfontdir ]; then
- (cd /usr/share/fonts/misc; /usr/X11R6/bin/mkfontdir)
-fi
-killall -USR1 xfs > /dev/null 2>&1 ||:
-
-%postun
-if [ -x /usr/X11R6/bin/mkfontdir ]; then
- (cd /usr/share/fonts/misc; /usr/X11R6/bin/mkfontdir)
-fi
-killall -USR1 xfs > /dev/null 2>&1 ||:
%files
%defattr(644,root,root,755)
-%doc docs-html/* bios/VGABIOS-elpin-LICENSE* .bochsrc* *.gz
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/keymaps
%attr(755,root,root) %{_bindir}/*
-%dir %{_datadir}/bochs
-%{_datadir}/bochs/*
-%{_datadir}/fonts/misc/*.pcf*
-%{_datadir}/man/man1/*
+%attr(755,root,root) %{_datadir}/%{name}/keymaps/convertmap.pl
+%{_datadir}/%{name}/keymaps/*.map
+%{_datadir}/%{name}/*BIOS*
+%{_mandir}/man[15]/*
+%{_docdir}/%{name}-%{version}