From edce51f12791cf10f223a9653c38f1a20a7e0a2d Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@fedoraproject.org>
Date: Jul 11 2006 13:52:53 +0000
Subject: Added require to use libvirt >= 0.1.2 and stop the httpd server, use the

    safer unix socket based one instead, Daniel

---

diff --git a/xen-3.0.2-config-allow-unix-server.patch b/xen-3.0.2-config-allow-unix-server.patch
new file mode 100644
index 0000000..8c3928e
--- /dev/null
+++ b/xen-3.0.2-config-allow-unix-server.patch
@@ -0,0 +1,31 @@
+*** xen-3.0.2/tools/examples/xend-config.sxp.orig	2006-06-07 12:53:18.000000000 +0200
+--- xen-3.0.2/tools/examples/xend-config.sxp	2006-07-11 15:43:47.000000000 +0200
+***************
+*** 15,27 ****
+  #(loglevel DEBUG)
+  
+  #(xend-http-server no)
+! #(xend-unix-server no)
+  #(xend-tcp-xmlrpc-server no)
+  #(xend-unix-xmlrpc-server yes)
+  #(xend-relocation-server no)
+  (xend-relocation-server yes)
+  
+! #(xend-unix-path /var/lib/xend/xend-socket)
+  
+  # Port xend should use for the HTTP interface, if xend-http-server is set.
+  #(xend-port            8000)
+--- 15,27 ----
+  #(loglevel DEBUG)
+  
+  #(xend-http-server no)
+! (xend-unix-server yes)
+  #(xend-tcp-xmlrpc-server no)
+  #(xend-unix-xmlrpc-server yes)
+  #(xend-relocation-server no)
+  (xend-relocation-server yes)
+  
+! (xend-unix-path /var/lib/xend/xend-socket)
+  
+  # Port xend should use for the HTTP interface, if xend-http-server is set.
+  #(xend-port            8000)
diff --git a/xen.spec b/xen.spec
index d7af30f..254a892 100644
--- a/xen.spec
+++ b/xen.spec
@@ -5,7 +5,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.0.2
-Release: 11
+Release: 12
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -21,7 +21,7 @@ Patch12: xen-3.0.1-tempdir.patch
 
 # Patches to modify the default config of xend
 Patch100: xen-config-dom0-minmem.patch
-Patch101: xen-config-allow-http.patch
+Patch102: xen-3.0.2-config-allow-unix-server.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: transfig libidn-devel zlib-devel texi2html SDL-devel curl-devel
@@ -38,6 +38,7 @@ BuildRequires: /usr/include/gnu/stubs-32.h
 Requires: bridge-utils
 Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires: udev >= 059
+Requires: libvirt >= 0.1.2
 Requires: libvirt-python
 Requires: xen-libs = %{version}-%{release}
 Prereq: chkconfig
@@ -85,7 +86,7 @@ virtual machines.
 
 # config patches
 %patch100 -p1
-%patch101 -p1
+%patch102 -p1
 
 cp %{SOURCE2} .
 
@@ -197,6 +198,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* 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
+
 * Mon Jul 10 2006 Jeremy Katz <katzj@redhat.com> - 3.0.2-11
 - split into main packages + -libs and -devel subpackages for #198260
 - add patch from jfautley to allow specifying other bridge for