devel/kvm .cvsignore, 1.15, 1.16 kvm.spec, 1.28, 1.29 sources, 1.15, 1.16 kvm-35-ldflags.patch, 1.1, NONE kvm-36-pxeboot.patch, 1.1, NONE kvm-rtl8139-checksum.patch, 1.1, NONE kvm-rtl8139-mmio-regions.patch, 1.1, NONE qemu-0.9.0-vnc-authentication.patch, 1.2, NONE qemu-atapi-hsm.patch, 1.1, NONE

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/pkgs/devel/kvm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19342

Modified Files:
	.cvsignore kvm.spec sources 
Removed Files:
	kvm-35-ldflags.patch kvm-36-pxeboot.patch 
	kvm-rtl8139-checksum.patch kvm-rtl8139-mmio-regions.patch 
	qemu-0.9.0-vnc-authentication.patch qemu-atapi-hsm.patch 
Log Message:
* Tue Nov  6 2007 Jeremy Katz <katzj at redhat.com> - 50-1
- update to kvm-50, drop all the patches that have gone upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/kvm/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	4 Sep 2007 19:00:54 -0000	1.15
+++ .cvsignore	6 Nov 2007 14:18:19 -0000	1.16
@@ -1 +1 @@
-kvm-36.tar.gz
+kvm-50.tar.gz


Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/devel/kvm/kvm.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- kvm.spec	15 Oct 2007 18:00:47 -0000	1.28
+++ kvm.spec	6 Nov 2007 14:18:19 -0000	1.29
@@ -1,25 +1,20 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
-Version: 36
-Release: 7%{?dist}
+Version: 50
+Release: 1%{?dist}
 License: GPLv2+, LGPLv2+
 Group: Development/Tools
 URL: http://kvm.sf.net
 Source0: http://download.sourceforge.net/sourceforge/kvm/kvm-%{version}.tar.gz
 Source1: kvm.modules
 Patch0: kvm-19-defaults.patch
-Patch1: kvm-35-ldflags.patch
-Patch2: kvm-bootmenu.patch
+Patch1: kvm-bootmenu.patch
 # patches from upstream qemu
-Patch101: kvm-rtl8139-mmio-regions.patch
-Patch102: qemu-atapi-hsm.patch
-Patch103: qemu-0.9.0-vnc-authentication.patch
-Patch104: kvm-rtl8139-checksum.patch
-Patch105: kvm-36-pxeboot.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel 
 # to build the bios
 BuildRequires: dev86
+BuildRequires: iasl
 BuildRequires: %{_includedir}/gnu/stubs-32.h
 # qemu doesn't build with gcc 4.x
 BuildRequires: compat-gcc-34 
@@ -44,20 +39,12 @@
 %prep
 %setup -q
 %patch0 -p1 -b .defaults
-%patch1 -p1 -b .ldflags
-%patch2 -p1 
-
-%patch101 -p1
-%patch102 -p0
-%patch103 -p1 -b .vnc
-%patch104 -p1
-%patch105 -p1
+%patch1 -p1 
 
 %build
-LDFLAGS=-Wl,--build-id ./configure --with-patched-kernel --qemu-cc=gcc34 --kerneldir=$(pwd)/kernel --prefix=%{_prefix}
 # we need to install the data bits in a different path
-sed -i 's/CONFIG_QEMU_SHAREDIR \"\/usr\/share\/qemu\"/CONFIG_QEMU_SHAREDIR \"\/usr\/share\/kvm\"/' qemu/config-host.h
-sed -i 's/datadir=\/usr\/share\/qemu/datadir=\/usr\/share\/kvm/' qemu/config-host.mak
+sed -i 's/datasuffix=\"\/share\/qemu\"/datasuffix=\"\/share\/kvm\"/' qemu/configure
+./configure --with-patched-kernel --qemu-cc=gcc34 --kerneldir=$(pwd)/kernel --prefix=%{_prefix} --qemu-ldflags="-Wl,--build-id" --enable-alsa
 
 # we can't use RPM_OPT_FLAGS for the same reasons as qemu (#208026) for the
 # qemu bits.  so let's set it for the other pieces.  this requires some
@@ -99,6 +86,9 @@
 %{_sysconfdir}/sysconfig/modules/kvm.modules
 
 %changelog
+* Tue Nov  6 2007 Jeremy Katz <katzj at redhat.com> - 50-1
+- update to kvm-50, drop all the patches that have gone upstream
+
 * Mon Oct 15 2007 Daniel P. Berrange <berrange at redhat.com> - 36-7.fc8
 - Fixed PXE boot when KVM is enabled (rhbz #331191)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/kvm/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	4 Sep 2007 19:00:54 -0000	1.15
+++ sources	6 Nov 2007 14:18:19 -0000	1.16
@@ -1 +1 @@
-0fdbc4a6228f3876166fc0d6f01bb668  kvm-36.tar.gz
+d2fa0d499e385a20fee36eba5ae411d6  kvm-50.tar.gz


--- kvm-35-ldflags.patch DELETED ---


--- kvm-36-pxeboot.patch DELETED ---


--- kvm-rtl8139-checksum.patch DELETED ---


--- kvm-rtl8139-mmio-regions.patch DELETED ---


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


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