rpms/bochs/F-11 bochs.spec,1.42,1.43 sources,1.15,1.16

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/bochs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32374

Modified Files:
	bochs.spec sources 
Log Message:
BZ 544310.



Index: bochs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bochs/F-11/bochs.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- bochs.spec	11 Mar 2009 17:13:22 -0000	1.42
+++ bochs.spec	8 Dec 2009 16:34:13 -0000	1.43
@@ -1,7 +1,7 @@
 %define githead 04387139e3b
 Name:           bochs
 Version:        2.3.8
-Release:        0.6.git%{githead}%{?dist}
+Release:        0.9.git%{githead}%{?dist}
 Summary:        Portable x86 PC emulator
 Group:          Applications/Emulators
 License:        LGPLv2+
@@ -14,8 +14,9 @@ Source0:        %{name}-%{version}.tar.g
 
 # This should not live here, but letting it in the kvm package would produce another noarch package we would
 # then have to get rid of in the future. So let it be.
-# git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm-userspace.git
-# git archive --format=tar --prefix=kvm-bios.tar.gz HEAD bios | gzip > ../kvm-bios.tar.gz
+# git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/qemu-kvm.git
+# cd kvm
+# git archive --format=tar --prefix=kvm-bios/ HEAD bios | gzip > ../../kvm-bios.tar.gz
 Source1:	kvm-bios.tar.gz
 
 Patch0:	%{name}-0001_bx-qemu.patch
@@ -143,6 +144,7 @@ CONFIGURE_FLAGS=" \
   --with-rfb \
   --with-sdl \
   --without-wx \
+  --enable-cpu-level=6 \
   $ARCH_CONFIGURE_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS -DPARANOID"
 
@@ -171,6 +173,10 @@ cp BIOS-bochs-latest ../../bios/BIOS-boc
 rm -rf $RPM_BUILD_ROOT _installed-docs
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{_prefix}/share/bochs/VGABIOS*
+ln -s %{_prefix}/share/vgabios/VGABIOS-lgpl-latest.bin $RPM_BUILD_ROOT%{_prefix}/share/bochs/VGABIOS-lgpl-latest
+ln -s %{_prefix}/share/vgabios/VGABIOS-lgpl-latest.cirrus.bin $RPM_BUILD_ROOT%{_prefix}/share/bochs/VGABIOS-lgpl-latest.cirrus
+ln -s %{_prefix}/share/vgabios/VGABIOS-lgpl-latest.cirrus.debug.bin $RPM_BUILD_ROOT%{_prefix}/share/bochs/VGABIOS-lgpl-latest.cirrus.debug
+ln -s %{_prefix}/share/vgabios/VGABIOS-lgpl-latest.debug.bin $RPM_BUILD_ROOT%{_prefix}/share/bochs/VGABIOS-lgpl-latest.debug
 %ifnarch %{ix86} x86_64
 rm -rf $RPM_BUILD_ROOT%{_prefix}/share/bochs/*BIOS*
 %endif
@@ -202,6 +208,7 @@ rm -rf $RPM_BUILD_ROOT
 %files bios
 %defattr(-,root,root,-)
 %{_datadir}/bochs/BIOS*
+%{_datadir}/bochs/VGABIOS*
 %endif
 
 
@@ -215,6 +222,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 04 2009 Jon Ciesla <limb at jcomserv.net> 2.3.8-0.9.git04387139e3b
+- Include symlinks to VGABIOS in vgabios rpm, BZ 544310.
+- Enable cpu level 6.
+
+* Fri Jul 31 2009 Glauber Costa <glommer at redhat.com> - 2:0.10.50-14.kvm88
+- replace kvm-bios with a more modern version, and refresh instructions on how to get it.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.8-0.7.git04387139e3b
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Mar 11 2009 Glauber Costa <glommer at redhat.com> 2.3.8-0.6.git04387139e3b
 - Fix Obsoletes/Provides pair.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bochs/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	11 Mar 2009 16:48:03 -0000	1.15
+++ sources	8 Dec 2009 16:34:13 -0000	1.16
@@ -1,2 +1,2 @@
+6a9ea13ca552ab7369206196b0dc1afa  kvm-bios.tar.gz
 a360358375ad00487f0f26dcc667a4a4  bochs-2.3.8.tar.gz
-9fb228d2176430963c4d2d8afcf2faff  kvm-bios.tar.gz