|
|
|
|
@@ -1,15 +1,11 @@
|
|
|
|
|
# -*- rpm-spec -*-
|
|
|
|
|
|
|
|
|
|
%define with_xen 0%{!?_without_xen:1}
|
|
|
|
|
%define with_xen_proxy 0%{!?_without_xen_proxy:1}
|
|
|
|
|
%define with_qemu 0%{!?_without_qemu:1}
|
|
|
|
|
%define with_openvz 0%{!?_without_openvz:1}
|
|
|
|
|
%define with_lxc 0%{!?_without_lxc:1}
|
|
|
|
|
%define with_sasl 0%{!?_without_sasl:1}
|
|
|
|
|
%define with_avahi 0%{!?_without_avahi:1}
|
|
|
|
|
%define with_polkit 0%{!?_without_polkit:0}
|
|
|
|
|
%define with_python 0%{!?_without_python:1}
|
|
|
|
|
%define with_libvirtd 0%{!?_without_libvirtd:1}
|
|
|
|
|
%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
|
|
|
|
|
@@ -26,19 +22,18 @@
|
|
|
|
|
%endif
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if 0%{?fedora} >= 8
|
|
|
|
|
%define with_polkit 0%{!?_without_polkit:1}
|
|
|
|
|
%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.6
|
|
|
|
|
Release: 3%{?dist}%{?extra_release}
|
|
|
|
|
Version: 0.4.5
|
|
|
|
|
Release: 1%{?dist}%{?extra_release}
|
|
|
|
|
License: LGPLv2+
|
|
|
|
|
Group: Development/Libraries
|
|
|
|
|
Source: libvirt-%{version}.tar.gz
|
|
|
|
|
Patch0: python_make.patch
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
|
|
URL: http://libvirt.org/
|
|
|
|
|
BuildRequires: python python-devel
|
|
|
|
|
@@ -51,12 +46,10 @@ Requires: iptables
|
|
|
|
|
# So remote clients can access libvirt over SSH tunnel
|
|
|
|
|
# (client invokes 'nc' against the UNIX socket on the server)
|
|
|
|
|
Requires: nc
|
|
|
|
|
%if %{with_sasl}
|
|
|
|
|
Requires: cyrus-sasl
|
|
|
|
|
# Not technically required, but makes 'out-of-box' config
|
|
|
|
|
# work correctly & doesn't have onerous dependencies
|
|
|
|
|
Requires: cyrus-sasl-md5
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with_polkit}
|
|
|
|
|
Requires: PolicyKit >= 0.6
|
|
|
|
|
%endif
|
|
|
|
|
@@ -89,18 +82,14 @@ BuildRequires: readline-devel
|
|
|
|
|
BuildRequires: ncurses-devel
|
|
|
|
|
BuildRequires: gettext
|
|
|
|
|
BuildRequires: gnutls-devel
|
|
|
|
|
%if %{with_avahi}
|
|
|
|
|
BuildRequires: avahi-devel
|
|
|
|
|
%endif
|
|
|
|
|
BuildRequires: libselinux-devel
|
|
|
|
|
BuildRequires: dnsmasq
|
|
|
|
|
BuildRequires: bridge-utils
|
|
|
|
|
%if %{with_qemu}
|
|
|
|
|
BuildRequires: qemu
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with_sasl}
|
|
|
|
|
BuildRequires: cyrus-sasl-devel
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with_polkit}
|
|
|
|
|
BuildRequires: PolicyKit-devel >= 0.6
|
|
|
|
|
%endif
|
|
|
|
|
@@ -144,7 +133,6 @@ Obsoletes: libvir-devel
|
|
|
|
|
Includes and documentations for the C library providing an API to use
|
|
|
|
|
the virtualization capabilities of recent versions of Linux (and other OSes).
|
|
|
|
|
|
|
|
|
|
%if %{with_python}
|
|
|
|
|
%package python
|
|
|
|
|
Summary: Python bindings for the libvirt library
|
|
|
|
|
Group: Development/Libraries
|
|
|
|
|
@@ -156,11 +144,9 @@ The libvirt-python package contains a module that permits applications
|
|
|
|
|
written in the Python programming language to use the interface
|
|
|
|
|
supplied by the libvirt library to use the virtualization capabilities
|
|
|
|
|
of recent versions of Linux (and other OSes).
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%prep
|
|
|
|
|
%setup -q
|
|
|
|
|
%patch0 -p0
|
|
|
|
|
|
|
|
|
|
%build
|
|
|
|
|
%if ! %{with_xen}
|
|
|
|
|
@@ -179,35 +165,10 @@ of recent versions of Linux (and other OSes).
|
|
|
|
|
%define _without_lxc --without-lxc
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if ! %{with_sasl}
|
|
|
|
|
%define _without_sasl --without-sasl
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if ! %{with_avahi}
|
|
|
|
|
%define _without_avahi --without-avahi
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if ! %{with_polkit}
|
|
|
|
|
%define _without_polkit --without-polkit
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if ! %{with_python}
|
|
|
|
|
%define _without_python --without-python
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if ! %{with_libvirtd}
|
|
|
|
|
%define _without_libvirtd --without-libvirtd
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%configure %{?_without_xen} \
|
|
|
|
|
%{?_without_qemu} \
|
|
|
|
|
%{?_without_openvz} \
|
|
|
|
|
%{?_without_lxc} \
|
|
|
|
|
%{?_without_sasl} \
|
|
|
|
|
%{?_without_avahi} \
|
|
|
|
|
%{?_without_polkit} \
|
|
|
|
|
%{?_without_python} \
|
|
|
|
|
%{?_without_libvirtd} \
|
|
|
|
|
--with-init-script=redhat \
|
|
|
|
|
--with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
|
|
|
|
|
--with-remote-file=%{_localstatedir}/run/libvirtd.pid
|
|
|
|
|
@@ -229,7 +190,6 @@ install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/images/
|
|
|
|
|
# Default dir for kernel+initrd images defnied in SELinux policy
|
|
|
|
|
install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/boot/
|
|
|
|
|
|
|
|
|
|
%if %{with_qemu}
|
|
|
|
|
# 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.
|
|
|
|
|
@@ -240,30 +200,14 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml
|
|
|
|
|
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
|
|
|
|
|
# Strip auto-generated UUID - we need it generated per-install
|
|
|
|
|
sed -i -e "/<uuid>/d" $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml
|
|
|
|
|
%else
|
|
|
|
|
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml
|
|
|
|
|
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
|
|
|
|
|
rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_qemu.aug
|
|
|
|
|
rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
|
|
|
|
|
%endif
|
|
|
|
|
%find_lang %{name}
|
|
|
|
|
|
|
|
|
|
%if ! %{with_python}
|
|
|
|
|
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-python-%{version}
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if ! %{with_qemu}
|
|
|
|
|
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu.conf
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%clean
|
|
|
|
|
rm -fr %{buildroot}
|
|
|
|
|
|
|
|
|
|
%post
|
|
|
|
|
/sbin/ldconfig
|
|
|
|
|
|
|
|
|
|
%if %{with_libvirtd}
|
|
|
|
|
%if %{with_qemu}
|
|
|
|
|
# We want to install the default network for initial RPM installs
|
|
|
|
|
# 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
|
|
|
|
|
@@ -276,18 +220,14 @@ then
|
|
|
|
|
> %{_sysconfdir}/libvirt/qemu/networks/default.xml
|
|
|
|
|
ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
|
|
|
|
|
fi
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
/sbin/chkconfig --add libvirtd
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%preun
|
|
|
|
|
%if %{with_libvirtd}
|
|
|
|
|
if [ $1 = 0 ]; then
|
|
|
|
|
/sbin/service libvirtd stop 1>/dev/null 2>&1
|
|
|
|
|
/sbin/chkconfig --del libvirtd
|
|
|
|
|
fi
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%postun
|
|
|
|
|
/sbin/ldconfig
|
|
|
|
|
@@ -300,69 +240,37 @@ fi
|
|
|
|
|
%{_bindir}/virsh
|
|
|
|
|
%{_libdir}/lib*.so.*
|
|
|
|
|
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/
|
|
|
|
|
|
|
|
|
|
%if %{with_qemu}
|
|
|
|
|
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/
|
|
|
|
|
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/
|
|
|
|
|
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if %{with_libvirtd}
|
|
|
|
|
%{_sysconfdir}/rc.d/init.d/libvirtd
|
|
|
|
|
%config(noreplace) %{_sysconfdir}/sysconfig/libvirtd
|
|
|
|
|
%config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if %{with_qemu}
|
|
|
|
|
%config(noreplace) %{_sysconfdir}/libvirt/qemu.conf
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if %{with_sasl}
|
|
|
|
|
%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if %{with_qemu}
|
|
|
|
|
%dir %{_datadir}/libvirt/
|
|
|
|
|
%dir %{_datadir}/libvirt/networks/
|
|
|
|
|
%{_datadir}/libvirt/networks/default.xml
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%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}
|
|
|
|
|
%{_datadir}/augeas/lenses/libvirtd_qemu.aug
|
|
|
|
|
%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if %{with_libvirtd}
|
|
|
|
|
%{_datadir}/augeas/lenses/libvirtd.aug
|
|
|
|
|
%{_datadir}/augeas/lenses/libvirtd_qemu.aug
|
|
|
|
|
%{_datadir}/augeas/lenses/tests/test_libvirtd.aug
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
|
|
|
|
|
%if %{with_polkit}
|
|
|
|
|
%{_datadir}/PolicyKit/policy/org.libvirt.unix.policy
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if %{with_qemu}
|
|
|
|
|
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%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
|
|
|
|
|
|
|
|
|
|
%if %{with_libvirtd}
|
|
|
|
|
%attr(0755, root, root) %{_libexecdir}/libvirt_parthelper
|
|
|
|
|
%attr(0755, root, root) %{_sbindir}/libvirtd
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%doc docs/*.rng
|
|
|
|
|
%doc docs/*.xml
|
|
|
|
|
|
|
|
|
|
@@ -382,7 +290,6 @@ fi
|
|
|
|
|
%doc docs/examples
|
|
|
|
|
%doc docs/libvirt-api.xml
|
|
|
|
|
|
|
|
|
|
%if %{with_python}
|
|
|
|
|
%files python
|
|
|
|
|
%defattr(-, root, root)
|
|
|
|
|
|
|
|
|
|
@@ -393,55 +300,35 @@ fi
|
|
|
|
|
%doc python/TODO
|
|
|
|
|
%doc python/libvirtclass.txt
|
|
|
|
|
%doc docs/examples/python
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Wed Sep 24 2008 Daniel Veillard <veillard@redhat.com> - 0.4.6-3.fc10
|
|
|
|
|
- apply the python makefile patch for #463733
|
|
|
|
|
|
|
|
|
|
* Wed Sep 24 2008 Daniel Veillard <veillard@redhat.com> - 0.4.6-2.fc10
|
|
|
|
|
- upstream release 0.4.6
|
|
|
|
|
- fixes some problems with 0.4.5
|
|
|
|
|
|
|
|
|
|
* Tue Sep 9 2008 Daniel Veillard <veillard@redhat.com> - 0.4.5-2.fc10
|
|
|
|
|
- fix a crash if a QEmu/KVM domain is defined without an emulator path
|
|
|
|
|
|
|
|
|
|
* Mon Sep 8 2008 Daniel Veillard <veillard@redhat.com> - 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
|
|
|
|
|
|
|
|
|
|
* Thu Aug 7 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0.4.4-3.fc10
|
|
|
|
|
- fix license tag
|
|
|
|
|
|
|
|
|
|
* Tue Jul 8 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.4-2.fc10
|
|
|
|
|
* Tue Jul 8 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.4-2.fc9
|
|
|
|
|
- Fix booting of CDROM images with KVM (rhbz #452355)
|
|
|
|
|
|
|
|
|
|
* Wed Jun 25 2008 Daniel Veillard <veillard@redhat.com> - 0.4.4-1.fc10
|
|
|
|
|
- upstream release 0.4.4
|
|
|
|
|
- fix a few bugs in previous release
|
|
|
|
|
* Thu Jun 25 2008 Daniel Veillard <veillard@redhat.com> - 0.4.4-1.fc9
|
|
|
|
|
- upstream release of 0.4.4
|
|
|
|
|
- fixes a few bug in previous release
|
|
|
|
|
|
|
|
|
|
* Thu Jun 12 2008 Daniel Veillard <veillard@redhat.com> - 0.4.3-1.fc10
|
|
|
|
|
* Thu Jun 12 2008 Daniel Veillard <veillard@redhat.com> - 0.4.3-1.fc9
|
|
|
|
|
- upstream release 0.4.3
|
|
|
|
|
- many bug fixes
|
|
|
|
|
- many small improvements
|
|
|
|
|
- serious xenner fixes
|
|
|
|
|
|
|
|
|
|
* Wed Jun 4 2008 Mark McLoughlin <markmc@redhat.com> - 0.4.2-6.fc10
|
|
|
|
|
* Wed Jun 4 2008 Mark McLoughlin <markmc@redhat.com> - 0.4.2-4.fc9
|
|
|
|
|
- Disable lokkit support again (#449996, #447633)
|
|
|
|
|
- Ensure %{fedora} is evaluated correctly
|
|
|
|
|
- Ensure PolicyKit is enabled (#446616)
|
|
|
|
|
|
|
|
|
|
* Thu May 15 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.2-5.fc10
|
|
|
|
|
- Rebuild with policy enabled (rhbz #446616)
|
|
|
|
|
|
|
|
|
|
* Fri May 9 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.2-4.fc10
|
|
|
|
|
* Fri May 9 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.2-3.fc9
|
|
|
|
|
- Added directory for initrd/kernel images for SELinux policy
|
|
|
|
|
|
|
|
|
|
* Mon Apr 28 2008 Mark McLoughlin <markmc@redhat.com> - 0.4.2-3.fc10
|
|
|
|
|
- Simplify the way arch conditionals are handled
|
|
|
|
|
|
|
|
|
|
* Mon Apr 28 2008 Mark McLoughlin <markmc@redhat.com> - 0.4.2-2.fc10
|
|
|
|
|
* Mon Apr 28 2008 Mark McLoughlin <markmc@redhat.com> - 0.4.2-2.fc9
|
|
|
|
|
- Enable lokkit support (#443796)
|
|
|
|
|
|
|
|
|
|
* Tue Apr 8 2008 Daniel Veillard <veillard@redhat.com> - 0.4.2-1.fc9
|
|
|
|
|
|
