rpms/qemu/devel qemu-0.9.1-nic-defaults.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 qemu.spec, 1.29, 1.30 sources, 1.8, 1.9 qemu-0.8.0-sdata.patch, 1.1, NONE qemu-0.9.0-atapi-hsm.patch, 1.1, NONE qemu-0.9.0-load-initrd.patch, 1.1, NONE qemu-0.9.0-nic-defaults.patch, 1.1, NONE qemu-0.9.0-rtl8139-checksum.patch, 1.1, NONE qemu-0.9.0-rtl8139-mmio-regions.patch, 1.1, NONE qemu-0.9.0-vnc-authentication.patch, 1.1, NONE

Daniel P. Berrange (berrange) fedora-extras-commits at redhat.com
Tue Jan 8 22:35:09 UTC 2008 

Author: berrange

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

Modified Files:
	.cvsignore qemu.spec sources 
Added Files:
	qemu-0.9.1-nic-defaults.patch 
Removed Files:
	qemu-0.8.0-sdata.patch qemu-0.9.0-atapi-hsm.patch 
	qemu-0.9.0-load-initrd.patch qemu-0.9.0-nic-defaults.patch 
	qemu-0.9.0-rtl8139-checksum.patch 
	qemu-0.9.0-rtl8139-mmio-regions.patch 
	qemu-0.9.0-vnc-authentication.patch 
Log Message:
Updated to new 0.9.1 release; Don't mark init script as a config file; Fix license tag syntax

qemu-0.9.1-nic-defaults.patch:

--- NEW FILE qemu-0.9.1-nic-defaults.patch ---
diff -rup qemu-0.9.1.orig/hw/pc.c qemu-0.9.1.new/hw/pc.c
--- qemu-0.9.1.orig/hw/pc.c	2008-01-06 14:38:42.000000000 -0500
+++ qemu-0.9.1.new/hw/pc.c	2008-01-08 17:06:27.000000000 -0500
@@ -913,7 +913,7 @@ static void pc_init1(int ram_size, int v
         nd = &nd_table[i];
         if (!nd->model) {
             if (pci_enabled) {
-                nd->model = "ne2k_pci";
+                nd->model = "rtl8139";
             } else {
                 nd->model = "ne2k_isa";
             }
diff -rup qemu-0.9.1.orig/vl.c qemu-0.9.1.new/vl.c
--- qemu-0.9.1.orig/vl.c	2008-01-06 14:38:42.000000000 -0500
+++ qemu-0.9.1.new/vl.c	2008-01-08 17:05:40.000000000 -0500
@@ -8787,7 +8787,7 @@ int main(int argc, char **argv)
 	    char buf[1024];
             if (net_boot & (1 << i)) {
                 if (model == NULL)
-                    model = "ne2k_pci";
+                    model = "rtl8139";
                 snprintf(buf, sizeof(buf), "%s/pxe-%s.bin", bios_dir, model);
                 if (get_image_size(buf) > 0) {
                     if (nb_option_roms >= MAX_OPTION_ROMS) {


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qemu/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Feb 2007 17:22:51 -0000	1.8
+++ .cvsignore	8 Jan 2008 22:34:32 -0000	1.9
@@ -1 +1,3 @@
-qemu-0.9.0.tar.gz
+.build*.log
+*.src.rpm
+qemu-0.9.1.tar.gz


Index: qemu.spec
===================================================================
RCS file: /cvs/extras/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- qemu.spec	27 Sep 2007 03:26:18 -0000	1.29
+++ qemu.spec	8 Jan 2008 22:34:32 -0000	1.30
@@ -7,26 +7,16 @@
 
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
-Version: 0.9.0
-Release: 5%{?dist}
-License: GPLv2+, LGPLv2+
+Version: 0.9.1
+Release: 1%{?dist}
+License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 URL: http://www.qemu.org/
 Source0: http://www.qemu.org/%{name}-%{version}.tar.gz
 Source1: qemu.init
 Patch0: qemu-0.7.0-build.patch
-Patch1: qemu-0.8.0-sdata.patch
-Patch2: qemu-0.9.0-load-initrd.patch
 # Change default NIC to rtl8139 to get link-state detection
-Patch3: qemu-0.9.0-nic-defaults.patch
-# Add VNC auth. Upstream backport. Remove at next upgrade
-Patch4: qemu-0.9.0-vnc-authentication.patch
-# Fix RTL8139 MMIO regions. Remove at next upgrade
-Patch5: qemu-0.9.0-rtl8139-mmio-regions.patch
-# Fix Atapi errors with latest kernel
-Patch6: qemu-0.9.0-atapi-hsm.patch
-# Fix RTL8139 checksum calculations for Vista
-Patch7: qemu-0.9.0-rtl8139-checksum.patch
+Patch3: qemu-0.9.1-nic-defaults.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel compat-gcc-%{gccver} zlib-devel which texi2html gnutls-devel
 Requires(post): /sbin/chkconfig
@@ -50,13 +40,7 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p0
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p0
 
 %build
 ./configure \
@@ -102,12 +86,17 @@
 %doc Changelog README TODO
 %doc qemu-doc.html qemu-tech.html
 %doc COPYING COPYING.LIB LICENSE
-%config %{_sysconfdir}/rc.d/init.d/qemu
+%{_sysconfdir}/rc.d/init.d/qemu
 %{_bindir}/qemu*
 %{_prefix}/share/qemu/
 %{_mandir}/man1/*
 
 %changelog
+* Tue Jan  8 2008 Daniel P. Berrange <berrange at redhat.com> - 0.9.1-1.fc9
+- Updated to 0.9.1 release
+- Fix license tag syntax
+- Don't mark init script as a config file
+
 * Wed Sep 26 2007 Daniel P. Berrange <berrange at redhat.com> - 0.9.0-5.fc8
 - Fix rtl8139 checksum calculation for Vista (rhbz #308201)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qemu/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Feb 2007 17:22:51 -0000	1.8
+++ sources	8 Jan 2008 22:34:32 -0000	1.9
@@ -1 +1 @@
-ab11a03ba30cf4a70641f0f170473d69  qemu-0.9.0.tar.gz
+6591df8e9270eb358c881de4ebea1262  qemu-0.9.1.tar.gz


--- qemu-0.8.0-sdata.patch DELETED ---


--- qemu-0.9.0-atapi-hsm.patch DELETED ---


--- qemu-0.9.0-load-initrd.patch DELETED ---


--- qemu-0.9.0-nic-defaults.patch DELETED ---


--- qemu-0.9.0-rtl8139-checksum.patch DELETED ---


--- qemu-0.9.0-rtl8139-mmio-regions.patch DELETED ---


--- qemu-0.9.0-vnc-authentication.patch DELETED ---

More information about the fedora-extras-commits mailing list