X-Git-Url: http://git.pld-linux.org/?p=packages%2Fbochs.git;a=blobdiff_plain;f=bochs.spec;h=41425f8d03abc11a50de4e00b5204065fbadc8c0;hp=601a56214b449d249e3319796a428d7a816392f8;hb=c513063cf0961dc3a8398c326e118b85b410a954;hpb=9f1b7f3314b68ac1b3eaa7ca72e7364b145c700a

diff --git a/bochs.spec b/bochs.spec
index 601a562..41425f8 100644
--- a/bochs.spec
+++ b/bochs.spec
@@ -1,14 +1,14 @@
 Summary:	Portable x86 PC Emulator
-Summary(pl):	Przeno¶ny emulator x96 PC
+Summary(pl):	Przeno¶ny emulator x86 PC
 Name:		bochs
-Version:	1.1.2
+Version:	1.3
 Release:	1
 License:	GPL
 Group:		Applications/Emulators
-Group(de):	Applikationen/Emulators
-Group(pl):	Aplikacje/Emulatory
-Source0:	ftp://bochs.com/pub/%{name}-%{version}.tar.gz
-URL:		http://www.bochs.com/
+Source0:	http://prdownloads.sourceforge.net/bochs/%{name}-%{version}.tar.gz
+URL:		http://bochs.sourceforge.net/
+BuildRequires:	XFree86-devel
+BuildRequires:	libstdc++-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -18,15 +18,15 @@ 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
-architektóry procesora x86 oraz hardwaru AT i BIOS-u ¿eby uruchomiæ
-DOS-a, windows'95, Minix 2.0 i inne systemu operacyjne, wszystkie na
-twoim komputerze.
+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
+Twoim komputerze.
 
 %prep
 %setup -q
 
 %build
-%configure \
+%configure2_13 \
 	--with-x \
 	--enable-cpu-level=5 \
 	--enable-vga \
@@ -35,24 +35,30 @@ twoim komputerze.
 	--with-x11
 %{__make}
 cd font
-for i in vga.bdf hercules.bdf; 
-do
-	bdftopcf $i -o `basename $i .bdf`.pcf
-done;
+#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}
-install bochs $RPM_BUILD_ROOT/%{_bindir}
-install bios/BIOS-bochs-990925a bios/VGABIOS-elpin-2.40 $RPM_BUILD_ROOT%{_datadir}/bochs/bios
+install -d $RPM_BUILD_ROOT/{%{_bindir},%{_datadir}/bochs/bios,%{_datadir}/fonts/misc,%{_mandir}/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/{bochs,bochsrc,bximage}.1 $RPM_BUILD_ROOT%{_mandir}/man1
+
 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
-gzip -9nf docs-html/* bios/VGABIOS-elpin-LICENSE .bochsrc font/*.pcf
-install font/*.pcf* $RPM_BUILD_ROOT%{_datadir}/fonts/misc
+
+gzip -9nf bios/VGABIOS-elpin-LICENSE .bochsrc font/*.pcf CHANGES TESTFORM.txt
+
+install font/hercules.pcf* $RPM_BUILD_ROOT%{_datadir}/fonts/misc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -70,8 +76,10 @@ killall -USR1 xfs > /dev/null 2>&1 ||:
 
 %files
 %defattr(644,root,root,755)
-%doc docs-html/* bios/VGABIOS-elpin-LICENSE* .bochsrc*
+%doc docs-html/*.html bios/VGABIOS-elpin-LICENSE* .bochsrc* *.gz
 %attr(755,root,root) %{_bindir}/bochs
+%attr(755,root,root) %{_bindir}/bximage
 %dir %{_datadir}/bochs
 %{_datadir}/bochs/*
 %{_datadir}/fonts/misc/*.pcf*
+%{_mandir}/man1/*