Author: pascalek Date: Fri Jul 8 15:55:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - Relase 2 - missing BR - more flexible access to wxGTK config
---- Files affected: SPECS: bochs.spec (1.46 -> 1.47) ---- Diffs: ================================================================ Index: SPECS/bochs.spec diff -u SPECS/bochs.spec:1.46 SPECS/bochs.spec:1.47 --- SPECS/bochs.spec:1.46 Tue May 31 19:46:01 2005 +++ SPECS/bochs.spec Fri Jul 8 17:55:24 2005 @@ -9,7 +9,7 @@ Summary(pl): Przenośny emulator x86 PC Name: bochs Version: 2.2 -Release: 1 +Release: 2 License: GPL Group: Applications/Emulators Source0: http://dl.sourceforge.net/bochs/%{name}-%{version}.tar.gz @@ -21,12 +21,13 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: docbook-dtd41-sgml -BuildRequires: gtk+-devel +BuildRequires: gtk+2-devel BuildRequires: libstdc++-devel BuildRequires: ncurses-devel %{?with_svga:BuildRequires: svgalib-devel} BuildRequires: wxGTK2-devel BuildRequires: zlib-devel +BuildRequires: pkgconfig Requires: XFree86-fonts BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -48,13 +49,21 @@ %build cp -f /usr/share/automake/config.sub . %{__autoconf} -CXXFLAGS="%{rpmcflags} -I/usr/include/ncurses" -export CXXFLAGS +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 \ + WX_CONFIG=$WXGTK2CONFIG \ --enable-config-interface \ --enable-new-pit \ --enable-plugins \ @@ -138,6 +147,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.47 2005/07/08 15:55:24 pascalek +- Relase 2 +- missing BR +- more flexible access to wxGTK config + Revision 1.46 2005/05/31 17:46:01 qboosh - gpm-friendly Source0 URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/bochs.spec?r1=1.46&r2=1.47&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit