diff --git a/libvirt-0.4.4-boot-cdrom.patch b/libvirt-0.4.4-boot-cdrom.patch
deleted file mode 100644
index 4b35d2b..0000000
--- a/libvirt-0.4.4-boot-cdrom.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -rupN libvirt-0.4.4.orig/src/qemu_conf.c libvirt-0.4.4.new/src/qemu_conf.c
---- libvirt-0.4.4.orig/src/qemu_conf.c 2008-06-19 14:15:02.000000000 +0100
-+++ libvirt-0.4.4.new/src/qemu_conf.c 2008-07-08 12:24:07.000000000 +0100
-@@ -2616,7 +2616,8 @@ int qemudBuildCommandLine(virConnectPtr
- disk->src, qemudBusIdToName(disk->bus, 1),
- media ? media : "",
- idx,
-- bootable ? ",boot=on" : "");
-+ bootable && disk->device == QEMUD_DISK_DISK
-+ ? ",boot=on" : "");
-
- ADD_ARG_LIT("-drive");
- ADD_ARG_LIT(opt);
-diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args
---- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args 1970-01-01 01:00:00.000000000 +0100
-+++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args 2008-07-08 12:25:59.000000000 +0100
-@@ -0,0 +1 @@
-+/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot d -drive file=/dev/HostVG/QEMUGuest1,if=ide,index=0 -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,index=2 -net none -serial none -parallel none -usb
-\ No newline at end of file
-diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml
---- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml 1970-01-01 01:00:00.000000000 +0100
-+++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml 2008-07-08 12:20:42.000000000 +0100
-@@ -0,0 +1,26 @@
-+
-+ QEMUGuest1
-+ c7a5fdbd-edaf-9455-926a-d65c16db1809
-+ 219200
-+ 219200
-+ 1
-+
-+ hvm
-+
-+
-+
-+ destroy
-+ restart
-+ destroy
-+
-+ /usr/bin/qemu
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args
---- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args 1970-01-01 01:00:00.000000000 +0100
-+++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args 2008-07-08 12:13:15.000000000 +0100
-@@ -0,0 +1 @@
-+/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,index=0,boot=on -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,index=2 -net none -serial none -parallel none -usb
-\ No newline at end of file
-diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml
---- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml 1970-01-01 01:00:00.000000000 +0100
-+++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml 2008-07-08 12:12:41.000000000 +0100
-@@ -0,0 +1,26 @@
-+
-+ QEMUGuest1
-+ c7a5fdbd-edaf-9455-926a-d65c16db1809
-+ 219200
-+ 219200
-+ 1
-+
-+ hvm
-+
-+
-+
-+ destroy
-+ restart
-+ destroy
-+
-+ /usr/bin/qemu
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvtest.c libvirt-0.4.4.new/tests/qemuxml2argvtest.c
---- libvirt-0.4.4.orig/tests/qemuxml2argvtest.c 2008-06-02 10:16:46.000000000 +0100
-+++ libvirt-0.4.4.new/tests/qemuxml2argvtest.c 2008-07-08 12:21:53.000000000 +0100
-@@ -158,6 +158,10 @@ mymain(int argc, char **argv)
- QEMUD_CMD_FLAG_DRIVE_BOOT);
- DO_TEST("disk-xenvbd", QEMUD_CMD_FLAG_DRIVE |
- QEMUD_CMD_FLAG_DRIVE_BOOT);
-+ DO_TEST("disk-drive-boot-disk", QEMUD_CMD_FLAG_DRIVE |
-+ QEMUD_CMD_FLAG_DRIVE_BOOT);
-+ DO_TEST("disk-drive-boot-cdrom", QEMUD_CMD_FLAG_DRIVE |
-+ QEMUD_CMD_FLAG_DRIVE_BOOT);
- DO_TEST("graphics-vnc", 0);
- DO_TEST("graphics-sdl", 0);
- DO_TEST("input-usbmouse", 0);
diff --git a/libvirt.spec b/libvirt.spec
index c437203..44eabb2 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -1,32 +1,40 @@
# -*- rpm-spec -*-
-%if 0%{fedora} >= 8
-%define with_polkit 1
-%define with_proxy no
-%else
-%define with_polkit 0
-%define with_proxy yes
+%define with_xen 1
+%define with_xen_proxy 1
+%define with_qemu 1
+%define with_openvz 1
+%define with_lxc 1
+%define with_polkit 0
+
+# Xen is available only on i386 x86_64 ia64
+%ifnarch i386 i686 x86_64 ia64
+%define with_xen 0
+%endif
+
+%if ! %{with_xen}
+%define with_xen_proxy 0
%endif
%if "%{fedora}"
%ifarch ppc64
%define with_qemu 0
-%else
-%define with_qemu 1
%endif
-%else
-%define with_qemu 0
+%endif
+
+%if 0%{fedora} >= 8
+%define with_polkit 1
+%define with_xen_proxy 0
%endif
Summary: Library providing a simple API virtualization
Name: libvirt
-Version: 0.4.4
-Release: 2%{?dist}%{?extra_release}
-License: LGPL
+Version: 0.4.5
+Release: 1%{?dist}%{?extra_release}
+License: LGPLv2+
Group: Development/Libraries
Source: libvirt-%{version}.tar.gz
-Patch1: %{name}-%{version}-boot-cdrom.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
URL: http://libvirt.org/
BuildRequires: python python-devel
Requires: libxml2
@@ -47,12 +55,14 @@ Requires: PolicyKit >= 0.6
%endif
# For mount/umount in FS driver
BuildRequires: util-linux
-# PPC64 has no Xen nor QEmu, try to build anyway
-%ifnarch ppc64
+# For showmount in FS driver (netfs discovery)
+BuildRequires: nfs-utils
+Requires: nfs-utils
%if %{with_qemu}
# From QEMU RPMs
Requires: /usr/bin/qemu-img
%else
+%if %{with_xen}
# From Xen RPMs
Requires: /usr/sbin/qcow-create
%endif
@@ -63,10 +73,11 @@ Requires: lvm2
Requires: iscsi-initiator-utils
# For disk driver
Requires: parted
-%ifarch i386 x86_64 ia64
+%if %{with_xen}
BuildRequires: xen-devel
%endif
BuildRequires: libxml2-devel
+BuildRequires: xhtml1-dtds
BuildRequires: readline-devel
BuildRequires: ncurses-devel
BuildRequires: gettext
@@ -84,12 +95,11 @@ BuildRequires: PolicyKit-devel >= 0.6
%endif
# For mount/umount in FS driver
BuildRequires: util-linux
-# PPC64 has no Xen nor QEmu, try to build anyway
-%ifnarch ppc64
%if %{with_qemu}
# From QEMU RPMs
BuildRequires: /usr/bin/qemu-img
%else
+%if %{with_xen}
# From Xen RPMs
BuildRequires: /usr/sbin/qcow-create
%endif
@@ -114,7 +124,7 @@ Summary: Libraries, includes, etc. to compile with the libvirt library
Group: Development/Libraries
Requires: libvirt = %{version}
Requires: pkgconfig
-%ifarch i386 x86_64 ia64
+%if %{with_xen}
Requires: xen-devel
%endif
Obsoletes: libvir-devel
@@ -137,31 +147,32 @@ of recent versions of Linux (and other OSes).
%prep
%setup -q
-%patch1 -p1
%build
-# Xen is available only on i386 x86_64 ia64
-%ifarch i386 i686 x86_64 ia64
-%configure --with-init-script=redhat \
- --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
- --with-remote-file=%{_localstatedir}/run/libvirtd.pid \
- --with-xen-proxy=%{with_proxy}
-%else
-%ifnarch ppc64
-%configure --without-xen \
- --with-init-script=redhat \
- --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
- --with-remote-file=%{_localstatedir}/run/libvirtd.pid
-%else
-%configure --without-xen \
- --without-qemu \
- --with-init-script=redhat \
- --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
- --with-remote-file=%{_localstatedir}/run/libvirtd.pid
-%endif
+%if ! %{with_xen}
+%define _without_xen --without-xen
%endif
-make
+%if ! %{with_qemu}
+%define _without_qemu --without-qemu
+%endif
+
+%if ! %{with_openvz}
+%define _without_openvz --without-openvz
+%endif
+
+%if ! %{with_lxc}
+%define _without_lxc --without-lxc
+%endif
+
+%configure %{?_without_xen} \
+ %{?_without_qemu} \
+ %{?_without_openvz} \
+ %{?_without_lxc} \
+ --with-init-script=redhat \
+ --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
+ --with-remote-file=%{_localstatedir}/run/libvirtd.pid
+make %{?_smp_mflags}
%install
rm -fr %{buildroot}
@@ -244,14 +255,21 @@ fi
%dir %{_localstatedir}/lib/libvirt/
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/
+%{_datadir}/augeas/lenses/libvirtd.aug
+%{_datadir}/augeas/lenses/libvirtd_qemu.aug
+%{_datadir}/augeas/lenses/tests/test_libvirtd.aug
+%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
%if %{with_polkit}
-%{_datadir}/PolicyKit/policy/libvirtd.policy
+%{_datadir}/PolicyKit/policy/org.libvirt.unix.policy
%endif
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
-%if %{with_proxy} == "yes"
+%if %{with_xen_proxy}
%attr(4755, root, root) %{_libexecdir}/libvirt_proxy
%endif
%attr(0755, root, root) %{_libexecdir}/libvirt_parthelper
+%if %{with_lxc}
+%attr(0755, root, root) %{_libexecdir}/libvirt_lxc
+%endif
%attr(0755, root, root) %{_sbindir}/libvirtd
%doc docs/*.rng
%doc docs/*.xml
@@ -284,6 +302,12 @@ fi
%doc docs/examples/python
%changelog
+* Mon Sep 8 2008 Daniel Veillard - 0.4.5-1.fc10
+- upstream release 0.4.5
+- a lot of bug fixes
+- major updates to QEmu/KVM and Linux containers drivers
+- support for OpenVZ if installed
+
* Tue Jul 8 2008 Daniel P. Berrange - 0.4.4-2.fc9
- Fix booting of CDROM images with KVM (rhbz #452355)
diff --git a/sources b/sources
index 2e23883..ce6f52b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9407900dc16e0ba9ea3eec3cf0a56674 libvirt-0.4.4.tar.gz
+dcb590a6202c332907eae7b44e47ca4b libvirt-0.4.5.tar.gz