rpms/qemu/devel .cvsignore, 1.11, 1.12 qemu.spec, 1.63, 1.64 sources, 1.11, 1.12 qemu-sasl-01-tls-handshake-fix.patch, 1.2, NONE qemu-sasl-02-vnc-monitor-info.patch, 1.2, NONE qemu-sasl-03-display-keymaps.patch, 1.2, NONE qemu-sasl-04-vnc-struct.patch, 1.2, NONE qemu-sasl-05-vnc-tls-vencrypt.patch, 1.2, NONE qemu-sasl-06-vnc-sasl.patch, 1.2, NONE qemu-sasl-07-vnc-monitor-authinfo.patch, 1.2, NONE qemu-sasl-08-vnc-acl-mgmt.patch, 1.2, NONE

[Glauber Costa]

Author: glommer

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13180

Modified Files:
	.cvsignore qemu.spec sources 
Removed Files:
	qemu-sasl-01-tls-handshake-fix.patch 
	qemu-sasl-02-vnc-monitor-info.patch 
	qemu-sasl-03-display-keymaps.patch 
	qemu-sasl-04-vnc-struct.patch 
	qemu-sasl-05-vnc-tls-vencrypt.patch 
	qemu-sasl-06-vnc-sasl.patch 
	qemu-sasl-07-vnc-monitor-authinfo.patch 
	qemu-sasl-08-vnc-acl-mgmt.patch 
Log Message:
updated to new snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	3 Mar 2009 23:57:07 -0000	1.11
+++ .cvsignore	10 Mar 2009 23:43:31 -0000	1.12
@@ -1 +1 @@
-kvm-84.git-snapshot-20090303.tar.gz
+kvm-84.git-snapshot-20090310.tar.gz


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- qemu.spec	10 Mar 2009 20:59:18 -0000	1.63
+++ qemu.spec	10 Mar 2009 23:43:33 -0000	1.64
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10
-Release: 0.5.kvm20090303git%{?dist}
+Release: 0.6.kvm20090310git%{?dist}
 # I have mistakenly thought the revision name would be 1.0.
 # So 0.10 series get Epoch = 1
 Epoch: 2
@@ -10,25 +10,12 @@
 URL: http://www.qemu.org/
 #Source0: http://www.qemu.org/%{name}-%{version}.tar.gz
 # FIXME: Say how to get the sources
-Source0: kvm-84.git-snapshot-20090303.tar.gz
+Source0: kvm-84.git-snapshot-20090310.tar.gz
 Source1: qemu.init
 Source2: kvm.modules
 
-# VNC SASL authentication support
-# Not upstream yet, but approved for commit immediately
-# after this release
-Patch1: qemu-sasl-01-tls-handshake-fix.patch
-Patch2: qemu-sasl-02-vnc-monitor-info.patch
-Patch3: qemu-sasl-03-display-keymaps.patch
-Patch4: qemu-sasl-04-vnc-struct.patch
-Patch5: qemu-sasl-05-vnc-tls-vencrypt.patch
-Patch6: qemu-sasl-06-vnc-sasl.patch
-Patch7: qemu-sasl-07-vnc-monitor-authinfo.patch
-Patch8: qemu-sasl-08-vnc-acl-mgmt.patch
-Patch9: kvm-upstream-ppc.patch
-Patch10: kvm-fix-strayR.patch
-# NB, delibrately not including patch 09 which is not
-# intended for commit
+Patch1: kvm-upstream-ppc.patch
+Patch2: kvm-fix-strayR.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
@@ -190,25 +177,9 @@
 %endif
 
 %prep
-%setup -q -n kvm-84.git-snapshot-20090303
-# 01-tls-handshake-fix
+%setup -q -n kvm-84.git-snapshot-20090310
 %patch1 -p1
-# 02-vnc-monitor-info
 %patch2 -p1
-# 03-display-keymaps
-%patch3 -p1
-# 04-vnc-struct
-%patch4 -p1
-# 05-vnc-tls-vencrypt
-%patch5 -p1
-# 06-vnc-sasl
-%patch6 -p1
-# 07-vnc-monitor-authinfo
-%patch7 -p1
-# 08-vnc-acl-mgmt
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -258,7 +229,7 @@
                 sparc32plus-linux-user" \
     --prefix=%{_prefix} \
     --interp-prefix=%{_prefix}/qemu-%%M \
-            --kerneldir=$(pwd)/../kernel --prefix=%{_prefix} \
+    --kerneldir=$(pwd)/../kernel --prefix=%{_prefix} \
     --disable-kvm \
     --extra-ldflags=$extraldflags
 
@@ -438,6 +409,10 @@
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Tue Mar 10 2009 Glauber Costa <glommer at redhat.com> - 2:0.10-0.6.kvm20090310git
+- updated to kvm20090310git
+- removed sasl patches (already in this release)
+
 * Tue Mar 10 2009 Glauber Costa <glommer at redhat.com> - 2:0.10-0.5.kvm20090303git
 - kvm.modules were being wrongly mentioned at %%install.
 - update description for the x86 system package to include kvm support


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	3 Mar 2009 23:57:07 -0000	1.11
+++ sources	10 Mar 2009 23:43:33 -0000	1.12
@@ -1 +1 @@
-b81c0982015b21e01fe93a1d9405def8  kvm-84.git-snapshot-20090303.tar.gz
+a43cc777acc08855e0364d249bff3da6  kvm-84.git-snapshot-20090310.tar.gz


--- qemu-sasl-01-tls-handshake-fix.patch DELETED ---


--- qemu-sasl-02-vnc-monitor-info.patch DELETED ---


--- qemu-sasl-03-display-keymaps.patch DELETED ---


--- qemu-sasl-04-vnc-struct.patch DELETED ---


--- qemu-sasl-05-vnc-tls-vencrypt.patch DELETED ---


--- qemu-sasl-06-vnc-sasl.patch DELETED ---


--- qemu-sasl-07-vnc-monitor-authinfo.patch DELETED ---


--- qemu-sasl-08-vnc-acl-mgmt.patch DELETED ---