- rel 5

- check if xend is running our way

Changed files:
    libvirt-xend.patch -> 1.1
    libvirt.spec -> 1.67

diff --git a/libvirt-xend.patch b/libvirt-xend.patch
new file mode 100644 (file)
index 0000000..65cef73
--- /dev/null
+++ b/libvirt-xend.patch
@@ -0,0 +1,44 @@
+--- libvirt-0.9.10/src/xen/xen_driver.c~       2012-02-13 08:06:23.000000000 +0100
++++ libvirt-0.9.10/src/xen/xen_driver.c        2012-03-06 14:03:45.273637374 +0100
+@@ -240,7 +240,7 @@
+     int status;
+     int ret = 0;
+ 
+-    cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL);
++    cmd = virCommandNewArgList("/sbin/service", "xend", "status", NULL);
+     if (virCommandRun(cmd, &status) == 0 && status == 0)
+         ret = 1;
+     virCommandFree(cmd);
+--- libvirt-0.9.10/src/libxl/libxl_driver.c~   2012-02-06 03:50:50.000000000 +0100
++++ libvirt-0.9.10/src/libxl/libxl_driver.c    2012-03-06 14:27:35.983701925 +0100
+@@ -840,7 +840,7 @@
+     }
+ 
+     /* Disable driver if legacy xen toolstack (xend) is in use */
+-    cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL);
++    cmd = virCommandNewArgList("/sbin/service", "xend", "status", NULL);
+     if (virCommandRun(cmd, &status) == 0 && status == 0) {
+         VIR_INFO("Legacy xen tool stack seems to be in use, disabling "
+                   "libxenlight driver.");
+--- libvirt-0.9.10/tests/statstest.c~  2011-11-22 02:52:24.000000000 +0100
++++ libvirt-0.9.10/tests/statstest.c   2012-03-06 14:36:59.970394039 +0100
+@@ -56,7 +56,7 @@
+     uname(&ut);
+     if (strstr(ut.release, "xen") == NULL)
+         return EXIT_AM_SKIP;
+-    cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL);
++    cmd = virCommandNewArgList("/sbin/service", "xend", "status", NULL);
+     if (virCommandRun(cmd, &status) != 0 || status != 0) {
+         virCommandFree(cmd);
+         return EXIT_AM_SKIP;
+--- libvirt-0.9.10/tests/reconnect.c~  2011-11-22 02:52:24.000000000 +0100
++++ libvirt-0.9.10/tests/reconnect.c   2012-03-06 14:37:27.777061955 +0100
+@@ -29,7 +29,7 @@
+     uname(&ut);
+     if (strstr(ut.release, "xen") == NULL)
+         return EXIT_AM_SKIP;
+-    cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL);
++    cmd = virCommandNewArgList("/sbin/service", "xend", "status", NULL);
+     if (virCommandRun(cmd, &status) != 0 || status != 0) {
+         virCommandFree(cmd);
+         return EXIT_AM_SKIP;

diff --git a/libvirt.spec b/libvirt.spec
index d1d733a4e444d2e24a558b3a352cc236900cbc4e..78c73ae409158f7c24b16e4cd07a87503cfbcf31 100644 (file)
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -1,5 +1,3 @@
-# xenapi (libxenserver), xenlight (libxenlight)?
-# --with-driver-modules ?
 #
 # Conditional build:
 %bcond_without xen             # xen
@@ -32,7 +30,7 @@ Summary:      Toolkit to interact with virtualization capabilities
 Summary(pl.UTF-8):     Narzędzia współpracujące z funkcjami wirtualizacji
 Name:          libvirt
 Version:       0.9.10
-Release:       4
+Release:       5
 License:       LGPL v2.1+
 Group:         Base/Kernel
 Source0:       ftp://ftp.libvirt.org/libvirt/%{name}-%{version}.tar.gz
@@ -42,6 +40,7 @@ Source2:      %{name}.tmpfiles
 Patch0:                %{name}-sasl.patch
 Patch1:                %{name}-lxc.patch
 Patch2:                libvirt-qemu-acl.patch
+Patch3:                libvirt-xend.patch
 URL:           http://www.libvirt.org/
 BuildRequires: audit-libs-devel
 BuildRequires: augeas-devel
@@ -249,6 +248,7 @@ Zarządca blokad sanlock dla biblioteki libvirt.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # weird translations
 %{__rm} po/{my,eu_ES}.{po,gmo}