X-Git-Url: http://git.pld-linux.org/?p=packages%2Fbochs.git;a=blobdiff_plain;f=bochs.spec;h=d6c862dc5cb07d14d7b8abf322cdde6724d7ab93;hp=57ac9521f1e457ee3a41f2e861bd2de56f09b192;hb=45854ac5ead3de5a5f54635f847ddc297ec0e8cc;hpb=ecb20ae67faaba16e4d0167cf7685ad0e66e5588

diff --git a/bochs.spec b/bochs.spec
index 57ac952..d6c862d 100644
--- a/bochs.spec
+++ b/bochs.spec
@@ -1,26 +1,24 @@
 # TODO:
 #	- more subpackages (plugins)
-
+#
 # Conditional build:
-%bcond_without  svga    # without svgalib support
+%bcond_without	svga	# without svgalib support
 #
-%ifnarch %{ix86} alpha
-%undefine with_svga
-%endif
 Summary:	Portable x86 PC Emulator
 Summary(pl):	Przeno¶ny emulator x86 PC
 Name:		bochs
-Version:	2.1.1
+Version:	2.2
 Release:	1
 License:	GPL
 Group:		Applications/Emulators
-Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-# Source0-md5:	7b21efbe2b56cc15d110993234259b33
-Patch0:		%{name}-ncurses.patch
+Source0:	http://dl.sourceforge.net/bochs/%{name}-%{version}.tar.gz
+# Source0-md5:	2f0d82bda2193242a2d7ece1917016c1
+Patch0:		%{name}-instrumentation.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
@@ -39,15 +37,18 @@ 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
-%patch0	-p1
+%patch0 -p1
 
 %build
+cp -f /usr/share/automake/config.sub .
 %{__autoconf}
+CXXFLAGS="%{rpmcflags} -I/usr/include/ncurses"
+export CXXFLAGS
 # --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)
@@ -104,7 +105,7 @@ rm -rf $RPM_BUILD_ROOT
 	docdir=%{_docdir}/%{name}-%{version}
 
 mv -f $RPM_BUILD_ROOT%{_datadir}/bochs/VGABIOS*{LICENSE,README,latest} \
-    $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+	$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 cp -f TESTFORM.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
@@ -125,7 +126,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]/*