From ff5c4a8002532d4a0a21c9f7cb273acfed73dae0 Mon Sep 17 00:00:00 2001
From: Jeremy Katz <katzj@fedoraproject.org>
Date: Apr 26 2006 03:09:39 +0000
Subject: - update to post 3.0.2 snapshot (changeset: 9744:1ad06bd6832d)

- stop applying patches that are upstreamed
- add patches for bootloader to run on all domain creations
- make xenguest-install create a persistent uuid
- use libvirt for domain creation in xenguest-install, slightly improve
    error handling

---

diff --git a/.cvsignore b/.cvsignore
index a4705af..428b031 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 LibVNCServer-0.7.1.tar.gz
 xen-3.0.1-20060301.tar.bz2
+xen-20060425.tar.bz2
diff --git a/sources b/sources
index 5491d91..86523cb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 54110288b3171551c03467cd60976d55  LibVNCServer-0.7.1.tar.gz
-b6de980106e996ef5fdb845022c69bca  xen-3.0.1-20060301.tar.bz2
+aa6a152f82b01511f8f17a8d557340eb  xen-20060425.tar.bz2
diff --git a/xen.spec b/xen.spec
index 05e13d4..661531c 100644
--- a/xen.spec
+++ b/xen.spec
@@ -4,27 +4,31 @@
 
 Summary: Xen is a virtual machine monitor
 Name:    xen
-Version: 3.0.1
-Release: 5
+Version: 3.0.2
+Release: 1
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
-# xen-unstable cs 9022
-Source0: xen-3.0.1-20060301.tar.bz2
+# xen-unstable cs 9744:1ad06bd6832d
+Source0: xen-20060425.tar.bz2
 Source1: http://download.sf.net/libvncserver/LibVNCServer-%{libvncver}.tar.gz
 Source2: xenguest-install.py
 Source3: xen-udev.rules
-Patch0: xen-misc-fixes.patch
 Patch1: xen-initscript.patch
-Patch2: xen-kva-mmap.patch
-Patch3: xen-dom0-minmem.patch
 Patch4: xen-compile-fixes.patch
 Patch6: xen-network-iptables-bridge.patch
 Patch8: xen-vmxballoon-hack.patch
-Patch9: xen-3.0.1-config-allow-http.patch
 Patch10: xen-3.0.1-m64.patch
 Patch11: xen-3.0.1-cloexec.patch
 Patch12: xen-3.0.1-tempdir.patch
+Patch13: xen-check-returns.patch
+
+Patch20: xen-blchanges.patch
+
+# Patches to modify the default config of xend
+Patch100: xen-config-dom0-minmem.patch
+Patch101: xen-config-allow-http.patch
+
 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 
@@ -38,6 +42,7 @@ BuildRequires: udev
 Requires: bridge-utils
 Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires: udev >= 059
+Requires: libvirt-python
 Prereq: chkconfig
 ExclusiveArch: i386 x86_64
 
@@ -55,18 +60,21 @@ 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.1 -a 1
-%patch0 -p1 -b .misc
+%setup -q -n xen-unstable.hg -a 1
 %patch1 -p1 -b .init
-%patch2 -p1 -b .kva-mmap
-%patch3 -p1 -b .mem-min
 %patch4 -p1 -b .compile
 %patch6 -p1
 %patch8 -p1
-%patch9 -p1 
 %patch10 -p1 -b .m64
 %patch11 -p1 -b .cloexec
 %patch12 -p1 -b .tempdir
+%patch13 -p1 
+
+%patch20 -p1
+
+# config patches
+%patch100 -p1
+%patch101 -p1
 
 cp %{SOURCE2} .
 
@@ -165,6 +173,14 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_localstatedir}/run/xenstored
 
 %changelog
+* Tue Apr 25 2006 Jeremy Katz <katzj@redhat.com> - 3.0.2-1
+- update to post 3.0.2 snapshot (changeset:   9744:1ad06bd6832d)
+- stop applying patches that are upstreamed
+- add patches for bootloader to run on all domain creations
+- make xenguest-install create a persistent uuid
+- use libvirt for domain creation in xenguest-install, slightly improve 
+  error handling
+
 * Tue Apr 18 2006 Daniel Veillard <veillard@redhat.com> - 3.0.1-5
 - augment the close on exec patch with the fix for #188361