From 833165f5d6e84415c96c6de0bb4b65d9027b40d6 Mon Sep 17 00:00:00 2001
From: Daniel P. Berrange <berrange@fedoraproject.org>
Date: Jun 11 2007 18:59:12 +0000
Subject: Remove obsolete VNC monitor patch. Fixed HVM save/restore paths. Stpp bogus

    xen-vncfb daemon

---

diff --git a/xen.spec b/xen.spec
index 9bf4fa6..103d544 100644
--- a/xen.spec
+++ b/xen.spec
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.1.0
-Release: 1%{dist}
+Release: 2%{dist}
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -19,8 +19,8 @@ Patch19: xen-start-fail-cleanup.patch
 
 Patch20: xen-blktap-no-aio-epoll.patch
 Patch21: xen-blktap-error-returns.patch
-Patch24: xen-remove-vnc-monitor.patch
 Patch25: xen-qemu-vnc-delete.patch
+Patch26: xen-hvm-save-paths.patch
 
 # Patches to modify the default config of xend
 Patch100: xen-config-dom0-minmem.patch
@@ -31,6 +31,7 @@ Patch103: xen-3.0.2-config-disable-reloc.patch
 # from FC5/6 days. Can kill off once FC6 is EOL'd
 Patch150: xen-pvfb-compat.patch
 Patch151: xen-pvfb-terminate.patch
+Patch152: xen-pvfb-no-hvm.patch
 
 Patch251: pygrub-manykernels.patch
 
@@ -107,8 +108,8 @@ virtual machines.
 
 %patch20 -p1
 %patch21 -p1
-%patch24 -p1
 %patch25 -p1
+%patch26 -p1
 
 # config patches
 %patch100 -p1
@@ -118,6 +119,7 @@ virtual machines.
 # pvfb compat
 %patch150 -p1
 %patch151 -p1
+%patch152 -p1
 
 # upstream patches
 %patch251 -p1
@@ -248,6 +250,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Mon Jun 11 2007 Daniel Berrange <berrange@t60wlan.home.berrange.com> - 3.1.0-2.fc7
+- Remove patch which kills VNC monitor
+- Fix HVM save/restore file path to be /var/lib/xen instead of /tmp
+- Don't spawn a bogus xen-vncfb daemon for HVM guests
+
 * Fri May 25 2007 Daniel P. Berrange <berrange@redhat.com> - 3.1.0-1.fc7
 - Updated to official 3.1.0 tar.gz
 - Fixed data corruption from VNC client disconnect (bz 241303)