- updated to 1.0.0

- temporarily disable libxl support (no support for XEN 4.2, and it was
  not fully functional in XEN 4.1)
- updated BRs

diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index 0f59060f02acb42752791c98afad986a797ead0f..d54dbe739ac2816be591614a144eefcccfb22607 100644 (file)
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -174,8 +174,8 @@ diff -ru libvirt-0.8.8/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.arg
  LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
 -SASL_CONF_DIR=/root/.sasl2 QEMU_AUDIO_DRV=none /usr/bin/qemu -S -M pc -m 214 \
 +SASL_CONF_DIR=/root/.sasl QEMU_AUDIO_DRV=none /usr/bin/qemu -S -M pc -m 214 \
- -smp 1 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
- /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -vnc \
+ -smp 1 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
+ /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -vnc \
  127.0.0.1:3,sasl -vga cirrus
 diff -ru libvirt-0.8.8/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args libvirt-0.8.8-sasl/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
 --- libvirt-0.8.8/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args    2011-02-03 15:05:31.000000000 +0100
@@ -184,8 +184,8 @@ diff -ru libvirt-0.8.8/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
  LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
 -SASL_CONF_DIR=/root/.sasl2 QEMU_AUDIO_DRV=none /usr/bin/qemu -S -M pc -m 214 \
 +SASL_CONF_DIR=/root/.sasl QEMU_AUDIO_DRV=none /usr/bin/qemu -S -M pc -m 214 \
- -smp 1 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
- /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -vnc \
+ -smp 1 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
+ /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -vnc \
  127.0.0.1:3,tls,x509verify=/etc/pki/tls/qemu,sasl
 --- libvirt-0.10.1/tests/qemuxml2argvtest.c.orig       2012-08-22 05:19:44.000000000 +0200
 +++ libvirt-0.10.1/tests/qemuxml2argvtest.c    2012-09-02 14:17:43.448454451 +0200
@@ -195,6 +195,6 @@ diff -ru libvirt-0.8.8/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
      driver.vncSASL = 1;
 -    driver.vncSASLdir = strdup("/root/.sasl2");
 +    driver.vncSASLdir = strdup("/root/.sasl");
-     DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VGA);
+     DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_VGA);
      driver.vncTLS = 1;
      driver.vncTLSx509verify = 1;

diff --git a/libvirt.spec b/libvirt.spec
index c9eede6e0af5f77a3c40dd98800d50a9b32a7ef4..65b3bb638bad9cb0375ec891d0f84478e6a50935 100644 (file)
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -1,12 +1,13 @@
 #
-# TODO: seems that lxc patch is not needed anymore, verify that before removing
+# TODO: - seems that lxc patch is not needed anymore, verify that before removing
+#      - reenable libxl support as soon as libvirt supports XEN 4.2!
 #
 #
 # Conditional build:
 %bcond_without ceph            # RADOS BD (Ceph) storage support
 %bcond_without esx             # VMware ESX support
 %bcond_without hyperv          # Hyper-V support
-%bcond_without libxl           # libxenlight support
+%bcond_with    libxl           # libxenlight support
 %bcond_without lxc             # LXC support
 %bcond_without netcf           # host interfaces support
 %bcond_without openvz          # OpenVZ support
@@ -31,12 +32,12 @@
 Summary:       Toolkit to interact with virtualization capabilities
 Summary(pl.UTF-8):     Narzędzia współpracujące z funkcjami wirtualizacji
 Name:          libvirt
-Version:       0.10.2
-Release:       2
+Version:       1.0.0
+Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       ftp://ftp.libvirt.org/libvirt/%{name}-%{version}.tar.gz
-# Source0-md5: a5e50860d9da238ba270b528411c4a0d
+# Source0-md5: 7c8b006de7338e30866bb56738803b21
 Source1:       %{name}.init
 Source2:       %{name}.tmpfiles
 Patch0:                %{name}-sasl.patch
@@ -57,6 +58,7 @@ BuildRequires:        device-mapper-devel >= 1.0.0
 BuildRequires: gawk
 BuildRequires: gettext-devel >= 0.17
 BuildRequires: gnutls-devel >= 1.0.25
+BuildRequires: leveldb-devel
 BuildRequires: libapparmor-devel
 BuildRequires: libblkid-devel >= 2.17
 BuildRequires: libcap-ng-devel >= 0.4.0