|
|
|
|
@@ -1,4 +1,3 @@
|
|
|
|
|
%define _default_patch_fuzz 2 \n\n
|
|
|
|
|
# -*- rpm-spec -*-
|
|
|
|
|
|
|
|
|
|
# A client only build will create a libvirt.so only containing
|
|
|
|
|
@@ -62,6 +61,7 @@
|
|
|
|
|
%define with_udev 0%{!?_without_udev:0}
|
|
|
|
|
%define with_hal 0%{!?_without_hal:0}
|
|
|
|
|
%define with_yajl 0%{!?_without_yajl:0}
|
|
|
|
|
%define with_libpcap 0%{!?_without_libpcap:0}
|
|
|
|
|
|
|
|
|
|
# Non-server/HV driver defaults which are always enabled
|
|
|
|
|
%define with_python 0%{!?_without_python:1}
|
|
|
|
|
@@ -148,6 +148,11 @@
|
|
|
|
|
%define with_yajl 0%{!?_without_yajl:%{server_drivers}}
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
# Enable libpcap library
|
|
|
|
|
%if %{with_qemu}
|
|
|
|
|
%define with_libpcap 0%{!?_without_libpcap:%{server_drivers}}
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
# Force QEMU to run as non-root
|
|
|
|
|
%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
|
|
|
|
|
%define qemu_user qemu
|
|
|
|
|
@@ -169,8 +174,8 @@
|
|
|
|
|
|
|
|
|
|
Summary: Library providing a simple API virtualization
|
|
|
|
|
Name: libvirt
|
|
|
|
|
Version: 0.7.6
|
|
|
|
|
Release: 2%{?dist}%{?extra_release}
|
|
|
|
|
Version: 0.8.1
|
|
|
|
|
Release: 1%{?dist}%{?extra_release}
|
|
|
|
|
License: LGPLv2+
|
|
|
|
|
Group: Development/Libraries
|
|
|
|
|
Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
|
|
|
|
|
@@ -267,6 +272,9 @@ BuildRequires: libpciaccess-devel >= 0.10.9
|
|
|
|
|
%if %{with_yajl}
|
|
|
|
|
BuildRequires: yajl-devel
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with_libpcap}
|
|
|
|
|
BuildRequires: libpcap-devel
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with_avahi}
|
|
|
|
|
BuildRequires: avahi-devel
|
|
|
|
|
%endif
|
|
|
|
|
@@ -343,10 +351,6 @@ BuildRequires: netcf-devel >= 0.1.4
|
|
|
|
|
# Fedora build root suckage
|
|
|
|
|
BuildRequires: gawk
|
|
|
|
|
|
|
|
|
|
# --no-add-needed changes
|
|
|
|
|
BuildRequires: autoconf automake libtool
|
|
|
|
|
Patch0: libvirt-0.7.6-add-needed.patch
|
|
|
|
|
|
|
|
|
|
%description
|
|
|
|
|
Libvirt is a C toolkit to interact with the virtualization capabilities
|
|
|
|
|
of recent versions of Linux (and other OSes). The main package includes
|
|
|
|
|
@@ -399,7 +403,6 @@ of recent versions of Linux (and other OSes).
|
|
|
|
|
|
|
|
|
|
%prep
|
|
|
|
|
%setup -q
|
|
|
|
|
%patch0 -p1 -b .add-needed
|
|
|
|
|
|
|
|
|
|
%build
|
|
|
|
|
%if ! %{with_xen}
|
|
|
|
|
@@ -514,7 +517,6 @@ of recent versions of Linux (and other OSes).
|
|
|
|
|
%define _without_yajl --without-yajl
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
autoreconf -v --install
|
|
|
|
|
%configure %{?_without_xen} \
|
|
|
|
|
%{?_without_qemu} \
|
|
|
|
|
%{?_without_openvz} \
|
|
|
|
|
@@ -564,6 +566,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la
|
|
|
|
|
rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.a
|
|
|
|
|
|
|
|
|
|
%if %{with_network}
|
|
|
|
|
install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/lib/libvirt/dnsmasq/
|
|
|
|
|
# We don't want to install /etc/libvirt/qemu/networks in the main %files list
|
|
|
|
|
# because if the admin wants to delete the default network completely, we don't
|
|
|
|
|
# want to end up re-incarnating it on every RPM upgrade.
|
|
|
|
|
@@ -599,9 +602,14 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version}
|
|
|
|
|
|
|
|
|
|
%if ! %{with_qemu}
|
|
|
|
|
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu.conf
|
|
|
|
|
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.qemu
|
|
|
|
|
%endif
|
|
|
|
|
%if ! %{with_lxc}
|
|
|
|
|
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/lxc.conf
|
|
|
|
|
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.lxc
|
|
|
|
|
%endif
|
|
|
|
|
%if ! %{with_uml}
|
|
|
|
|
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.uml
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if %{with_libvirtd}
|
|
|
|
|
@@ -611,6 +619,17 @@ chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/libvirtd
|
|
|
|
|
%clean
|
|
|
|
|
rm -fr %{buildroot}
|
|
|
|
|
|
|
|
|
|
%check
|
|
|
|
|
cd tests
|
|
|
|
|
# These 3 tests don't current work in a mock build root
|
|
|
|
|
for i in nodeinfotest daemon-conf seclabeltest
|
|
|
|
|
do
|
|
|
|
|
rm -f $i
|
|
|
|
|
echo -e "#!/bin/sh\nexit 0" > $i
|
|
|
|
|
chmod +x $i
|
|
|
|
|
done
|
|
|
|
|
make check
|
|
|
|
|
|
|
|
|
|
%pre
|
|
|
|
|
%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
|
|
|
|
|
# Normally 'setup' adds this in /etc/passwd, but this is
|
|
|
|
|
@@ -631,7 +650,7 @@ getent passwd qemu >/dev/null || \
|
|
|
|
|
# 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 -a ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ]
|
|
|
|
|
if test $? != 0 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml
|
|
|
|
|
then
|
|
|
|
|
UUID=`/usr/bin/uuidgen`
|
|
|
|
|
sed -e "s,</name>,</name>\n <uuid>$UUID</uuid>," \
|
|
|
|
|
@@ -672,19 +691,26 @@ fi
|
|
|
|
|
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/
|
|
|
|
|
%{_sysconfdir}/libvirt/nwfilter/*.xml
|
|
|
|
|
|
|
|
|
|
%{_sysconfdir}/rc.d/init.d/libvirtd
|
|
|
|
|
%config(noreplace) %{_sysconfdir}/sysconfig/libvirtd
|
|
|
|
|
%config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
|
|
|
|
|
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd
|
|
|
|
|
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
|
|
|
|
|
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/lxc/
|
|
|
|
|
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/uml/
|
|
|
|
|
|
|
|
|
|
%if %{with_qemu}
|
|
|
|
|
%config(noreplace) %{_sysconfdir}/libvirt/qemu.conf
|
|
|
|
|
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with_lxc}
|
|
|
|
|
%config(noreplace) %{_sysconfdir}/libvirt/lxc.conf
|
|
|
|
|
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.lxc
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with_uml}
|
|
|
|
|
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.uml
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%dir %{_datadir}/libvirt/
|
|
|
|
|
@@ -717,6 +743,7 @@ fi
|
|
|
|
|
%if %{with_network}
|
|
|
|
|
%dir %{_localstatedir}/run/libvirt/network/
|
|
|
|
|
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/
|
|
|
|
|
%dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if %{with_qemu}
|
|
|
|
|
@@ -780,6 +807,7 @@ fi
|
|
|
|
|
%{_datadir}/libvirt/schemas/interface.rng
|
|
|
|
|
%{_datadir}/libvirt/schemas/secret.rng
|
|
|
|
|
%{_datadir}/libvirt/schemas/storageencryption.rng
|
|
|
|
|
%{_datadir}/libvirt/schemas/nwfilter.rng
|
|
|
|
|
|
|
|
|
|
%{_datadir}/libvirt/cpu_map.xml
|
|
|
|
|
|
|
|
|
|
@@ -822,6 +850,41 @@ fi
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Fri Apr 30 2010 Daniel Veillard <veillard@redhat.com> - 0.8.1-1
|
|
|
|
|
- Starts dnsmasq from libvirtd with --dhcp-hostsfile
|
|
|
|
|
- Add virDomainGetBlockInfo API to query disk sizing
|
|
|
|
|
- a lot of bug fixes and cleanups
|
|
|
|
|
|
|
|
|
|
* Mon Apr 12 2010 Daniel Veillard <veillard@redhat.com> - 0.8.0-1
|
|
|
|
|
- Upstream release 0.8.0
|
|
|
|
|
- Snapshotting support (QEmu/VBox/ESX)
|
|
|
|
|
- Network filtering API
|
|
|
|
|
- XenAPI driver
|
|
|
|
|
- new APIs for domain events
|
|
|
|
|
- Libvirt managed save API
|
|
|
|
|
- timer subselection for domain clock
|
|
|
|
|
- synchronous hooks
|
|
|
|
|
- API to update guest CPU to host CPU
|
|
|
|
|
- virDomainUpdateDeviceFlags new API
|
|
|
|
|
- migrate max downtime API
|
|
|
|
|
- volume wiping API
|
|
|
|
|
- and many bug fixes
|
|
|
|
|
|
|
|
|
|
* Tue Mar 30 2010 Richard W.M. Jones <rjones@redhat.com> - 0.7.7-3.fc14
|
|
|
|
|
- No change, just rebuild against new libparted with bumped soname.
|
|
|
|
|
|
|
|
|
|
* Mon Mar 22 2010 Cole Robinson <crobinso@redhat.com> - 0.7.7-2.fc14
|
|
|
|
|
- Fix USB devices by product with security enabled (bz 574136)
|
|
|
|
|
- Set kernel/initrd in security driver, fixes some URL installs (bz 566425)
|
|
|
|
|
|
|
|
|
|
* Fri Mar 5 2010 Daniel Veillard <veillard@redhat.com> - 0.7.7-1
|
|
|
|
|
- macvtap support
|
|
|
|
|
- async job handling
|
|
|
|
|
- virtio channel
|
|
|
|
|
- computing baseline CPU
|
|
|
|
|
- virDomain{Attach,Detach}DeviceFlags
|
|
|
|
|
- assorted bug fixes and lots of cleanups
|
|
|
|
|
|
|
|
|
|
* Tue Feb 16 2010 Adam Jackson <ajax@redhat.com> 0.7.6-2
|
|
|
|
|
- libvirt-0.7.6-add-needed.patch: Fix FTBFS from --no-add-needed
|
|
|
|
|
- Add BuildRequires: xmlrpc-c-client for libxmlrpc_client.so
|
|
|
|
|
|
