Changeset from: scop
Update of /cvs/extras/rpms/bochs/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv17342
Modified Files:
.cvsignore bochs.spec sources
Added Files:
bochs-fpu-regparm.patch
Log Message:
Sync with fedora.us 2.1.1-0.fdr.1, fix build on FC3.
bochs-fpu-regparm.patch:
--- NEW FILE bochs-fpu-regparm.patch ---
--- fpu/reg_ld_str.c 2004/02/11 19:40:25 1.19
+++ fpu/reg_ld_str.c 2004/05/17 19:50:43 1.20
@@ -304,7 +304,7 @@
/* Get a short from user memory */
-int BX_CPP_AttrRegparmN(1)
+int BX_CPP_AttrRegparmN(2)
FPU_load_int16(bx_address _s, FPU_REG *loaded_data)
{
s16 s, negative;
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 04:06:28 -0000 1.2
+++ .cvsignore 5 Dec 2004 16:23:17 -0000 1.3
@@ -1,2 +1,2 @@
-bochs-2.1.tar.gz
dlxlinux4.tar.gz
+bochs-2.1.1.tar.gz
Index: bochs.spec
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/bochs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bochs.spec 8 Nov 2004 04:07:55 -0000 1.3
+++ bochs.spec 5 Dec 2004 16:23:17 -0000 1.4
@@ -1,22 +1,24 @@
Name: bochs
-Version: 2.1
-Release: 0.fdr.2.1.2
+Version: 2.1.1
+Release: 1
Epoch: 0
Summary: Bochs Project x86 PC Emulator
Group: Applications/Emulators
License: LGPL
URL:
http://bochs.sourceforge.net/
-Source0:
http://download.sourceforge.net/bochs/bochs-2.1.tar.gz
+Source0:
http://download.sourceforge.net/bochs/bochs-2.1.1.tar.gz
Source1:
http://bochs.sourceforge.net/guestos/dlxlinux4.tar.gz
Patch0: %{name}-nonet-build.patch
Patch1: %{name}-buildpaths.patch
Patch2: %{name}-config.patch
Patch3: %{name}-gtk2.patch
Patch4: %{name}-dlxreadme.patch
+Patch5: %{name}-fpu-regparm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: docbook-utils, wxGTK2-devel, ncurses-c++-devel, dos2unix
+BuildRequires: docbook-utils, wxGTK2-devel, ncurses-devel, dos2unix
+BuildRequires: %{__perl}
%{?_with_sdl:BuildRequires: SDL-devel}
%{?_with_debugger:BuildRequires: readline-devel}
@@ -28,7 +30,7 @@
%package dlxlinux
Summary: DLX Linux hard disk image for Bochs
Group: Applications/Emulators
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} >= 0:2.0
%description dlxlinux
DLX is a version of Linux which was small enough to distribute along
@@ -44,8 +46,9 @@
%patch1 -p0
%patch3 -p0
%patch4 -p0
+%patch5 -p0
# Fix up some man page paths.
-perl -pi -e \
+%{__perl} -pi -e \
's|/usr/local/share/doc/bochs\b|%{_docdir}/%{name}-%{version}| ;
s|/usr/local/share/|%{_datadir}/|' \
doc/man/*.*
@@ -64,26 +67,26 @@
# Notes:
# - The CPU level, MMX et al affect what the emulator will emulate, they
# are not properties of the build target architecture.
-# - Using the following options makes the build fail as of 2.1:
+# - Using the following options makes the build fail as of 2.1(.1):
# --enable-3dnow --enable-external-debugger
%configure \
- --enable-cdrom \
- --enable-sb16=linux \
- --enable-ne2000 \
- --enable-vbe \
- --enable-all-optimizations \
--enable-plugins \
- --enable-pci \
- --enable-repeat-speedups \
- --enable-icache \
--enable-cpu-level=5 \
- --enable-mmx \
+ --enable-ne2000 \
+ --enable-pci \
+ --enable-4meg-pages \
+ --enable-pae \
%{?_with_debugger:--enable-debugger} \
- %{?_with_sdl:--with-sdl} \
+ --enable-all-optimizations \
+ --enable-vbe \
+ --enable-mmx \
+ --enable-cdrom \
+ --enable-sb16=linux \
--with-x11 \
--with-nogui \
--with-term \
--with-rfb \
+ %{?_with_sdl} \
--with-wx
make %{?_smp_mflags}
@@ -128,6 +131,13 @@
%changelog
+* Sun Dec 5 2004 Ville Skytt�� <ville.skytta at iki.fi> - 0:2.1.1-1
+- Update to 2.1.1.
+- Enable PAE and 4M pages support.
+- Loosen version in dlxlinux to main dependency.
+- BuildRequire ncurses-devel instead of ncurses-c++-devel for FC3.
+- Apply upstream fpu-regparm patch to fix the build on FC3.
+
* Fri Jan 16 2004 Ville Skytt�� <ville.skytta at iki.fi> - 0:2.1-0.fdr.2
- Fix RFB linking, force pthreads.
- dos2unix some -dlxlinux files.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 04:06:28 -0000 1.2
+++ sources 5 Dec 2004 16:23:17 -0000 1.3
@@ -1,2 +1,2 @@
-30bdb17e11fb416f9d3c6243e02f6e73 bochs-2.1.tar.gz
21c153f5aa391395c35f0c2f660da972 dlxlinux4.tar.gz
+7b21efbe2b56cc15d110993234259b33 bochs-2.1.1.tar.gz