X-Git-Url: http://git.pld-linux.org/?p=packages%2Fbochs.git;a=blobdiff_plain;f=bochs.spec;h=23dfea8fdf0df09b93b7e6c194839151fa8027e9;hp=10929a65b303f4f8fe5a352fddaab03a5b2b01a2;hb=560465c415f7aefcc2229df257a959b9c6122f5a;hpb=19437b6d5ddba251ca4fcfc43498d35b9153174d

diff --git a/bochs.spec b/bochs.spec
index 10929a6..23dfea8 100644
--- a/bochs.spec
+++ b/bochs.spec
@@ -2,31 +2,32 @@
 #	- more subpackages (plugins)
 #
 # Conditional build:
-%bcond_without  svga    # without svgalib support
+%bcond_without	svga	# without svgalib support
 #
 Summary:	Portable x86 PC Emulator
 Summary(pl):	Przeno¶ny emulator x86 PC
 Name:		bochs
-Version:	2.1.1
-Release:	2
+Version:	2.3
+Release:	0.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:	100c02fbcd402c2b4862d0251be539fd
+Patch0:		%{name}-wx.patch
 URL:		http://bochs.sourceforge.net/
 BuildRequires:	SDL-devel
-BuildRequires:	XFree86-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	docbook-dtd41-sgml
-BuildRequires:	gtk+-devel
+BuildRequires:	gtk+2-devel >= 1:2.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	ncurses-devel
+BuildRequires:	pkgconfig
 %{?with_svga:BuildRequires:	svgalib-devel}
 BuildRequires:	wxGTK2-devel
+#BuildRequires:	xorg-???-devel
 BuildRequires:	zlib-devel
-Requires:	XFree86-fonts
+#Requires:	xorg-font-???
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -42,17 +43,26 @@ Twoim komputerze.
 
 %prep
 %setup -q
-%patch0	-p1
+%patch0 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
 %{__autoconf}
+CXXFLAGS="%{rpmcflags} -I/usr/include/ncurses `pkg-config gdk-2.0 --cflags`"
+LDFLAGS=`pkg-config gdk-2.0 --libs`
+export CXXFLAGS LDFLAGS
 # --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)
+
+WXGTK2CONFIG=""
+[ -x /usr/bin/wx-gtk2-ansi-config ] && WXGTK2CONFIG=wx-gtk2-ansi-config
+[ -x /usr/bin/wxgtk-2.4-config ] && WXGTK2CONFIG=wxgtk-2.4-config
+
+[ "x$WXGTK2CONFIG" == "x" ] && echo "Can't find wxGTK2 config file!" && exit 1
+
 %configure \
-	WX_CONFIG=wxgtk2-2.4-config \
-	--enable-config-interface \
+	WX_CONFIG=$WXGTK2CONFIG \
 	--enable-new-pit \
 	--enable-plugins \
 	--enable-cpu-level=6 \
@@ -102,8 +112,8 @@ rm -rf $RPM_BUILD_ROOT
 	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}
+mv -f $RPM_BUILD_ROOT%{_datadir}/bochs/VGABIOS*{LICENSE,README} \
+	$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 cp -f TESTFORM.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
@@ -124,7 +134,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]/*