rpms/qemu/F-12 qemu.spec,1.137,1.138

[Mark McLoughlin]

Author: markmc

Update of /cvs/pkgs/rpms/qemu/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2165

Modified Files:
	qemu.spec 
Log Message:
* Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-4
- Use rtl8029 PXE rom for ne2k_pci, not ne (#526777)
- Also, replace the gpxe-roms-qemu pkg requires with file-based requires



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-12/qemu.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- qemu.spec	1 Oct 2009 22:38:01 -0000	1.137
+++ qemu.spec	5 Oct 2009 14:26:45 -0000	1.138
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.11.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -131,11 +131,15 @@ This package provides the user mode emul
 Summary: QEMU system emulator for x86
 Group: Development/Tools
 Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: gpxe-roms-qemu
-Requires: vgabios
-Requires: bochs-bios >= 2.3.8-0.8
 Provides: kvm = 85
 Obsoletes: kvm < 85
+Requires: vgabios
+Requires: bochs-bios >= 2.3.8-0.8
+Requires: /usr/share/gpxe/e1000-0x100e.rom
+Requires: /usr/share/gpxe/rtl8029.rom
+Requires: /usr/share/gpxe/pcnet32.rom
+Requires: /usr/share/gpxe/rtl8139.rom
+Requires: /usr/share/gpxe/virtio-net.rom
 
 %description system-x86
 QEMU is a generic and open source processor emulator which achieves a good
@@ -359,7 +363,7 @@ pxe_link() {
 }
 
 pxe_link e1000 e1000-0x100e
-pxe_link ne2k_pci ne
+pxe_link ne2k_pci rtl8029
 pxe_link pcnet pcnet32
 pxe_link rtl8139 rtl8139
 pxe_link virtio virtio-net
@@ -530,6 +534,10 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-4
+- Use rtl8029 PXE rom for ne2k_pci, not ne (#526777)
+- Also, replace the gpxe-roms-qemu pkg requires with file-based requires
+
 * Thu Oct  1 2009 Justin M. Forbes <jmforbes at redhat.com> - 2:0.11.0-3
 - Improve error reporting on file access (#524695)