|
|
|
@@ -11,6 +11,7 @@
|
|
|
|
|
%define with_python 0%{!?_without_python:1}
|
|
|
|
|
%define with_libvirtd 0%{!?_without_libvirtd:1}
|
|
|
|
|
%define with_uml 0%{!?_without_uml:1}
|
|
|
|
|
%define with_network 0%{!?_without_network:1}
|
|
|
|
|
|
|
|
|
|
# Xen is available only on i386 x86_64 ia64
|
|
|
|
|
%ifnarch i386 i686 x86_64 ia64
|
|
|
|
@@ -21,7 +22,7 @@
|
|
|
|
|
%define with_xen_proxy 0
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if "%{fedora}"
|
|
|
|
|
%if 0%{?fedora}
|
|
|
|
|
%ifarch ppc64
|
|
|
|
|
%define with_qemu 0
|
|
|
|
|
%endif
|
|
|
|
@@ -32,9 +33,20 @@
|
|
|
|
|
%define with_xen_proxy 0
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# If building on RHEL switch on the specific support
|
|
|
|
|
# for the specific Xen version
|
|
|
|
|
#
|
|
|
|
|
%if 0%{?fedora}
|
|
|
|
|
%define with_rhel5 0
|
|
|
|
|
%else
|
|
|
|
|
%define with_rhel5 1
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Summary: Library providing a simple API virtualization
|
|
|
|
|
Name: libvirt
|
|
|
|
|
Version: 0.5.0
|
|
|
|
|
Version: 0.6.0
|
|
|
|
|
Release: 1%{?dist}%{?extra_release}
|
|
|
|
|
License: LGPLv2+
|
|
|
|
|
Group: Development/Libraries
|
|
|
|
@@ -124,6 +136,8 @@ BuildRequires: lvm2
|
|
|
|
|
BuildRequires: iscsi-initiator-utils
|
|
|
|
|
# For disk driver
|
|
|
|
|
BuildRequires: parted-devel
|
|
|
|
|
# For QEMU/LXC numa info
|
|
|
|
|
BuildRequires: numactl-devel
|
|
|
|
|
Obsoletes: libvir
|
|
|
|
|
|
|
|
|
|
# Fedora build root suckage
|
|
|
|
@@ -205,6 +219,14 @@ of recent versions of Linux (and other OSes).
|
|
|
|
|
%define _without_uml --without-uml
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if %{with_rhel5}
|
|
|
|
|
%define _with_rhel5_api --with-rhel5-api
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if ! %{with_network}
|
|
|
|
|
%define _without_network --without-network
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%configure %{?_without_xen} \
|
|
|
|
|
%{?_without_qemu} \
|
|
|
|
|
%{?_without_openvz} \
|
|
|
|
@@ -215,6 +237,8 @@ of recent versions of Linux (and other OSes).
|
|
|
|
|
%{?_without_python} \
|
|
|
|
|
%{?_without_libvirtd} \
|
|
|
|
|
%{?_without_uml} \
|
|
|
|
|
%{?_without_network} \
|
|
|
|
|
%{?_with_rhel5_api} \
|
|
|
|
|
--with-init-script=redhat \
|
|
|
|
|
--with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
|
|
|
|
|
--with-remote-file=%{_localstatedir}/run/libvirtd.pid
|
|
|
|
@@ -275,7 +299,7 @@ rm -fr %{buildroot}
|
|
|
|
|
# or on the first upgrade from a non-network aware libvirt only.
|
|
|
|
|
# We check this by looking to see if the daemon is already installed
|
|
|
|
|
/sbin/chkconfig --list libvirtd 1>/dev/null 2>&1
|
|
|
|
|
if [ $? != 0 ]
|
|
|
|
|
if [ $? != 0 -a ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ]
|
|
|
|
|
then
|
|
|
|
|
UUID=`/usr/bin/uuidgen`
|
|
|
|
|
sed -e "s,</name>,</name>\n <uuid>$UUID</uuid>," \
|
|
|
|
@@ -318,6 +342,7 @@ fi
|
|
|
|
|
%{_sysconfdir}/rc.d/init.d/libvirtd
|
|
|
|
|
%config(noreplace) %{_sysconfdir}/sysconfig/libvirtd
|
|
|
|
|
%config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
|
|
|
|
|
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if %{with_qemu}
|
|
|
|
@@ -334,11 +359,41 @@ fi
|
|
|
|
|
%{_datadir}/libvirt/networks/default.xml
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%dir %{_datadir}/libvirt/
|
|
|
|
|
%dir %{_datadir}/libvirt/schemas/
|
|
|
|
|
|
|
|
|
|
%{_datadir}/libvirt/schemas/domain.rng
|
|
|
|
|
%{_datadir}/libvirt/schemas/network.rng
|
|
|
|
|
%{_datadir}/libvirt/schemas/storagepool.rng
|
|
|
|
|
%{_datadir}/libvirt/schemas/storagevol.rng
|
|
|
|
|
%{_datadir}/libvirt/schemas/nodedev.rng
|
|
|
|
|
%{_datadir}/libvirt/schemas/capability.rng
|
|
|
|
|
|
|
|
|
|
%dir %{_localstatedir}/run/libvirt/
|
|
|
|
|
|
|
|
|
|
%dir %{_localstatedir}/lib/libvirt/
|
|
|
|
|
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/
|
|
|
|
|
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/
|
|
|
|
|
|
|
|
|
|
%if %{with_qemu}
|
|
|
|
|
%dir %{_localstatedir}/run/libvirt/qemu/
|
|
|
|
|
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/qemu/
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with_lxc}
|
|
|
|
|
%dir %{_localstatedir}/run/libvirt/lxc/
|
|
|
|
|
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/lxc/
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with_uml}
|
|
|
|
|
%dir %{_localstatedir}/run/libvirt/uml/
|
|
|
|
|
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/uml/
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with_network}
|
|
|
|
|
%dir %{_localstatedir}/run/libvirt/network/
|
|
|
|
|
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/
|
|
|
|
|
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/filter/
|
|
|
|
|
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/nat/
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if %{with_qemu}
|
|
|
|
|
%{_datadir}/augeas/lenses/libvirtd_qemu.aug
|
|
|
|
|
%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
|
|
|
|
@@ -370,7 +425,6 @@ fi
|
|
|
|
|
%attr(0755, root, root) %{_sbindir}/libvirtd
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%doc docs/*.rng
|
|
|
|
|
%doc docs/*.xml
|
|
|
|
|
|
|
|
|
|
%files devel
|
|
|
|
@@ -403,6 +457,26 @@ fi
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Sat Jan 31 2009 Daniel Veillard <veillard@redhat.com> - 0.6.0-1.fc11
|
|
|
|
|
- upstream release 0.6.0
|
|
|
|
|
- thread safety of API
|
|
|
|
|
- allow QEmu/KVM domains to survive daemon restart
|
|
|
|
|
- extended logging capabilities
|
|
|
|
|
- support copy on write storage volumes for QEmu/KVM
|
|
|
|
|
- support of storage cache control options for QEmu/KVM
|
|
|
|
|
- a lot of bug fixes
|
|
|
|
|
|
|
|
|
|
* Wed Dec 17 2008 Daniel Veillard <veillard@redhat.com> - 0.5.1-2.fc11
|
|
|
|
|
- fix missing read-only access checks, fixes CVE-2008-5086
|
|
|
|
|
|
|
|
|
|
* Fri Dec 5 2008 Daniel Veillard <veillard@redhat.com> - 0.5.1-1.fc11
|
|
|
|
|
- upstream release 0.5.1
|
|
|
|
|
- mostly bugfixes e.g #473071
|
|
|
|
|
- some driver improvments
|
|
|
|
|
|
|
|
|
|
* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.5.0-2
|
|
|
|
|
- Rebuild for Python 2.6
|
|
|
|
|
|
|
|
|
|
* Wed Nov 26 2008 Daniel Veillard <veillard@redhat.com> - 0.5.0-1.fc11
|
|
|
|
|
- upstream release 0.5.0
|
|
|
|
|
- domain lifecycle event support
|
|
|
|
|