From a9475adb12cdd96b921d1bbeb6220e2b0762b6a4 Mon Sep 17 00:00:00 2001
From: Daniel P. Berrange <berrange@fedoraproject.org>
Date: Sep 27 2006 18:21:35 +0000
Subject: Incorporate two fixes to paravirt framebuffer bz 206313 & 208025


---

diff --git a/xen.spec b/xen.spec
index 7771052..5801308 100644
--- a/xen.spec
+++ b/xen.spec
@@ -25,6 +25,8 @@ Patch103: xen-3.0.2-config-disable-reloc.patch
 
 # patches going upstream (pv framebuffer)
 Patch200: xen-pvfb.patch
+Patch201: xen-pvfb-nocursor.patch
+Patch202: xen-pvfb-sigpipe.patch
 
 Patch250: pygrub-cursor.patch
 
@@ -101,7 +103,9 @@ virtual machines.
 %patch103 -p1
 
 # pv framebuffer patches
-%patch200 -p1 
+%patch200 -p1
+%patch201 -p1
+%patch202 -p1
 
 # upstream patches
 %patch250 -p1
@@ -121,7 +125,7 @@ vncdir=`pwd`
 popd
 sed -i -e "s;libvncserver-config;${vncdir}/libvncserver-config;" tools/xenfb/Makefile
 
-CFLAGS="$RPM_OPT_FLAGS" %{__make} XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs 
+CFLAGS="$RPM_OPT_FLAGS" %{__make} XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs
 
 %install
 rm -rf %{buildroot}
@@ -136,7 +140,7 @@ rm -rf %{buildroot}%{_datadir}/doc/qemu
 rm -rf %{buildroot}%{_sysconfdir}/hotplug
 
 # install all of the public headers
-mkdir -p %{buildroot}%{_includedir}/xen/io %{buildroot}%{_includedir}/xen/hvm 
+mkdir -p %{buildroot}%{_includedir}/xen/io %{buildroot}%{_includedir}/xen/hvm
 install -m 644 xen/include/public/io/*.h %{buildroot}%{_includedir}/xen/io
 install -m 644 xen/include/public/hvm/*.h %{buildroot}%{_includedir}/xen/hvm
 install -m 644 xen/include/public/*.h %{buildroot}%{_includedir}/xen/
@@ -215,6 +219,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Wed Sep 27 2006 Daniel Berrange <berrange@redhat.com> - 3.0.2-39
+- Disable paravirt framebuffer server side rendered cursor (bz 206313)
+- Ignore SIGPIPE in paravirt framebuffer daemon to avoid terminating
+  on client disconnects while writing data (bz 208025)
+
 * Wed Sep 27 2006 Jeremy Katz <katzj@redhat.com> - 3.0.2-38
 - Fix cursor in pygrub (#208041)