X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=bochs.spec;h=da3932be88477dd17d20d147e80c332a6a94b804;hb=f5ed92ec2cff3061e71254be4f48264c22fa98ee;hp=7638c764d490700dda667e8fde7c61555a529237;hpb=3912903fa20d7158cd02861a09964e0bcc4253b3;p=packages%2Fbochs.git

diff --git a/bochs.spec b/bochs.spec
index 7638c76..da3932b 100644
--- a/bochs.spec
+++ b/bochs.spec
@@ -4,17 +4,23 @@
 Summary:	Portable x86 PC Emulator
 Summary(pl):	Przeno¶ny emulator x86 PC
 Name:		bochs
-Version:	2.0
-Release:	1.2
+Version:	2.0.2
+Release:	2
 License:	GPL
 Group:		Applications/Emulators
-Source0:	http://telia.dl.sourceforge.net/sourceforge/bochs/%{name}-%{version}.tar.gz
+Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+# Source0-md5:	11bb4e7804f9fef3cda3822f03641b55
+Patch0:		%{name}-cpu.patch
+Patch1:		%{name}-ncurses.patch
+Patch2:		%{name}-wxGTK.patch
 URL:		http://bochs.sourceforge.net/
+BuildRequires:	SDL-devel
 BuildRequires:	XFree86-devel
+BuildRequires:	autoconf
+BuildRequires:	docbook-dtd41-sgml
 BuildRequires:	libstdc++-devel
+BuildRequires:	svgalib-devel
 BuildRequires:	wxGTK-devel
-BuildRequires:	SDL-devel
-BuildRequires: 	svgalib-devel
 #vga.pcf.gz
 Requires:	XFree86-fonts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -27,13 +33,17 @@ 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 systemu operacyjne, wszystkie na
 Twoim komputerze.
 
 %prep
 %setup -q
+%patch0	-p1
+%patch1	-p1
+%patch2	-p1
 
 %build
+%{__autoconf}
 %configure \
 	--enable-cdrom \
 	--enable-cpu-level=5 \
@@ -54,42 +64,42 @@ Twoim komputerze.
 	--with-rfb \
 	--with-sdl \
 	--with-svga \
-	--with-x11
-	
+	--with-x11 \
+	--with-term \
+	--with-rfb
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-    DESTDIR=$RPM_BUILD_ROOT \
-    docdir=%{_docdir}/%{name}-%{version}
+	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}
 
 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
 
-DIRS=`find $RPM_BUILD_ROOT -type d -name CVS`
-for DIR in $DIRS
-do
-    rm -rf $DIR
-done
+find $RPM_BUILD_ROOT -type d -name CVS | xargs rm -rf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/keymaps
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_datadir}/%{name}/keymaps/convertmap.pl
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/plugins
 %attr(755,root,root) %{_libdir}/%{name}/plugins/*.so.*
 %{_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]/*