rpms/bochs/devel bochs-precision.patch,NONE,1.1 bochs.spec,1.8,1.9

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/bochs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28120

Modified Files:
	bochs.spec 
Added Files:
	bochs-precision.patch 
Log Message:
Try to fix x86_64 build.

bochs-precision.patch:

--- NEW FILE bochs-precision.patch ---
--- iodev/eth_linux.cc~	2004-10-07 20:38:03.000000000 +0300
+++ iodev/eth_linux.cc	2005-05-29 20:51:15.000000000 +0300
@@ -215,7 +215,7 @@
   this->filter[3].k = (macaddr[0] & 0xff) << 8 | (macaddr[1] & 0xff);
   fp.len = BX_LSF_ICNT;
   fp.filter = this->filter;
-  BX_INFO(("eth_linux: fp.len=%d fp.filter=%x", fp.len, (unsigned) fp.filter));
+  BX_INFO(("eth_linux: fp.len=%d fp.filter=%lx", fp.len, (unsigned long) fp.filter));
   if (setsockopt(this->fd, SOL_SOCKET, SO_ATTACH_FILTER, &fp, sizeof(fp)) < 0) {
     BX_PANIC(("eth_linux: could not set socket filter: %s", strerror(errno)));
     close(this->fd);


Index: bochs.spec
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/bochs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- bochs.spec	28 May 2005 15:36:35 -0000	1.8
+++ bochs.spec	29 May 2005 18:08:59 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           bochs
 Version:        2.2
-Release:        1
+Release:        2
 Summary:        Portable x86 PC emulator
 
 Group:          Applications/Emulators
@@ -11,6 +11,7 @@
 Patch0:         %{name}-nonet-build.patch
 Patch1:         %{name}-dlxreadme.patch
 Patch2:         %{name}-config.patch
+Patch3:         %{name}-precision.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  docbook-utils
@@ -43,6 +44,7 @@
 %setup -q
 %patch0 -p0
 %patch1 -p0
+%patch3 -p0
 # Uh-oh, great!
 %{__perl} -pi -e \
   's|wx_needs_gtk2=0|wx_needs_gtk2=1| ;
@@ -122,6 +124,9 @@
 
 
 %changelog
+* Sun May 29 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.2-2
+- Try to fix x86_64 build.
+
 * Sat May 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.2-1
 - 2.2, buildpaths and fpu-regparms patches applied upstream, pthread and
   ncurses linking hacks no longer needed.