From 072c9c45abc52ad73377b36f75cb8aa2197c00c1 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Sep 08 2008 16:55:43 +0000 Subject: New upstream version, daniel --- diff --git a/.cvsignore b/.cvsignore index 5af9cf3..55e6af8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -3,6 +3,3 @@ i686 x86_64 libvirt-*.tar.gz -libvirt-0.4.2.tar.gz -libvirt-0.4.3.tar.gz -libvirt-0.4.4.tar.gz diff --git a/libvirt.spec b/libvirt.spec index 4d2bb1f..9a42704 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -3,6 +3,8 @@ %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 @@ -27,13 +29,12 @@ Summary: Library providing a simple API virtualization Name: libvirt -Version: 0.4.4 -Release: 3%{?dist}%{?extra_release} +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 @@ -54,6 +55,9 @@ Requires: PolicyKit >= 0.6 %endif # For mount/umount in FS driver BuildRequires: util-linux +# For showmount in FS driver (netfs discovery) +BuildRequires: nfs-utils +Requires: nfs-utils %if %{with_qemu} # From QEMU RPMs Requires: /usr/bin/qemu-img @@ -73,6 +77,7 @@ Requires: parted BuildRequires: xen-devel %endif BuildRequires: libxml2-devel +BuildRequires: xhtml1-dtds BuildRequires: readline-devel BuildRequires: ncurses-devel BuildRequires: gettext @@ -142,7 +147,6 @@ of recent versions of Linux (and other OSes). %prep %setup -q -%patch1 -p1 %build %if ! %{with_xen} @@ -153,12 +157,22 @@ of recent versions of Linux (and other OSes). %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 +make %{?_smp_mflags} %install rm -fr %{buildroot} @@ -241,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_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 @@ -281,6 +302,9 @@ fi %doc docs/examples/python %changelog +* Mon Sep 8 2008 Daniel Veillard - 0.4.5-1.fc10 +- upstream release 0.4.5 +- update * Thu Aug 7 2008 Tom "spot" Callaway - 0.4.4-3.fc10 - fix license tag 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