From faecd2adb11fc31374a168ea8ba4965d8562b203 Mon Sep 17 00:00:00 2001
From: Stephen Tweedie <sct@fedoraproject.org>
Date: Jul 13 2006 17:25:07 +0000
Subject: Update to xen-unstable cset 10675 Remove internal libvncserver build, new

    qemu device model has its own one now. Change default FV NIC model from
    rtl8139 to ne2k_pci until the former works better

---

diff --git a/.cvsignore b/.cvsignore
index a87975c..dbffffd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-LibVNCServer-0.7.1.tar.gz
-xen-unstable-10278.tar.bz2
+xen-unstable-10675.tar.bz2
diff --git a/sources b/sources
index 80a5839..eed6646 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-54110288b3171551c03467cd60976d55  LibVNCServer-0.7.1.tar.gz
-3a9ceecf483dad0a29364b73b445636c  xen-unstable-10278.tar.bz2
+7522262f0712687cb52c337553cab183  xen-unstable-10675.tar.bz2
diff --git a/xen.spec b/xen.spec
index 254a892..2300dd5 100644
--- a/xen.spec
+++ b/xen.spec
@@ -1,19 +1,17 @@
 %{!?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.2
-Release: 12
+Release: 13
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
-Source0: xen-unstable-10278.tar.bz2
-Source1: http://download.sf.net/libvncserver/LibVNCServer-%{libvncver}.tar.gz
+Source0: xen-unstable-10675.tar.bz2
 Source2: xenguest-install.py
 Source3: xen-udev.rules
 Patch1: xen-initscript.patch
+Patch2: xen-change-default-nic.patch
 Patch6: xen-network-iptables-bridge.patch
 Patch8: xen-vmxballoon-hack.patch
 Patch11: xen-3.0.1-cloexec.patch
@@ -77,8 +75,9 @@ This package contains what's needed to develop applications to manage Xen
 virtual machines. 
 
 %prep
-%setup -q -n xen-unstable.hg -a 1
+%setup -q -n xen-unstable.hg
 %patch1 -p1 -b .init
+%patch2 -p1 -b .nic
 %patch6 -p1
 %patch8 -p1
 #patch11 -p1 -b .cloexec
@@ -91,13 +90,6 @@ virtual machines.
 cp %{SOURCE2} .
 
 %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
@@ -198,6 +190,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Thu Jul 13 2006 Stephen C. Tweedie <sct@redhat.com> - 3.0.2-13
+- Update to xen-unstable cset 10675
+- Remove internal libvncserver build, new qemu device model has its own one
+  now.
+- Change default FV NIC model from rtl8139 to ne2k_pci until the former works
+  better
+
 * Tue Jul 11 2006 Daniel Veillard <veillard@redhat.com> - 3.0.2-12
 - bump libvirt requires to 0.1.2
 - drop xend httpd localhost server and use the unix socket instead