From 330f6e51586377f64dff0347b38b1dd43f5f7235 Mon Sep 17 00:00:00 2001
From: Jeremy Katz <katzj@fedoraproject.org>
Date: Jan 25 2006 23:41:00 +0000
Subject: - buildrequire dev86 so that vmx firmware gets built

- include a copy of libvncserver and build vmx device models against it

---

diff --git a/.cvsignore b/.cvsignore
index 59809f1..52940ee 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 xen-3.0.0-20060110.tar.bz2
+LibVNCServer-0.7.1.tar.gz
diff --git a/sources b/sources
index b0a33b4..4d6155d 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 d3aca23f36c287cc528b7fe8552ad2b3  xen-3.0.0-20060110.tar.bz2
+54110288b3171551c03467cd60976d55  LibVNCServer-0.7.1.tar.gz
diff --git a/xen.spec b/xen.spec
index 1c9f6c3..f5a28a2 100644
--- a/xen.spec
+++ b/xen.spec
@@ -1,13 +1,16 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
+%define libvncver 0.7.1
+
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.0
-Release: 0.20060110.fc5.4
+Release: 0.20060110.fc5.5
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
 Source0: xen-3.0.0-20060110.tar.bz2
+Source1: http://download.sf.net/libvncserver/LibVNCServer-%{libvncver}.tar.gz
 Patch0: xen-misc-fixes.patch
 Patch1: xen-initscript.patch
 Patch3: xen-dom0-minmem.patch
@@ -16,6 +19,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: transfig libidn-devel zlib-devel texi2html SDL-devel curl-devel
 BuildRequires: libX11-devel python-devel ghostscript tetex-latex 
 BuildRequires: ncurses-devel
+BuildRequires: dev86
 Requires: bridge-utils
 Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires: udev >= 059
@@ -36,13 +40,20 @@ Don't be surprised if this RPM eats your data, drinks your coffee
 or makes fun of you in front of your friends.
 
 %prep
-%setup -q -n xen-3.0.0
+%setup -q -n xen-3.0.0 -a 1
 %patch0 -p1 -b .misc
 %patch1 -p1 -b .init
 %patch3 -p1 -b .mem-min
 %patch4 -p1 -b .compile
 
 %build
+pushd LibVNCServer-%{libvncver}
+%configure
+make
+vncdir=`pwd`
+popd
+
+sed -i -e "s;libvncserver-config;${vncdir}/libvncserver-config;" tools/ioemu/configure
 CFLAGS="$RPM_OPT_FLAGS" %{__make} XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs 
 
 %install
@@ -123,6 +134,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_localstatedir}/run/xenstored
 
 %changelog
+* Wed Jan 25 2006 Jeremy Katz <katzj@redhat.com> - 3.0-0.20060110.fc5.5
+- buildrequire dev86 so that vmx firmware gets built
+- include a copy of libvncserver and build vmx device models against it 
+
 * Tue Jan 24 2006 Bill Nottingham <notting@redhat.com> - 3.0-0.20060110.fc5.4
 - only put the udev rules in one place