rpm/libvirt
SHA256
1
0
Fork 0
forked from pool/libvirt
Code Pull Requests Activity

- Update to libvirt 0.9.0 final

Browse Source 
- Support cpu usage tuning
  - Add public APIs for storage volume upload/download
  - Add public API for setting migration speed on the fly
  - Add libxenlight driver
  - qemu: support migration to fd
  - add virDomain{Get,Set}BlkioParameters
  - introduce a new libvirt API (virDomainSetMemoryFlags)
  - Expose event loop implementation as a public API
  - Dump the debug buffer to libvirtd.log on fatal signal
  - Audit support
  - Numerous enhancements and bug fixes

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=112
This commit is contained in:
James Fehlig 2011-04-04 22:08:05 +00:00 committed by Git OBS Bridge
parent a475094f61
commit 331f9906ac
3 changed files with 343 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libvirt-0.9.0.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:88d34ed2763694154a6c8b6847730d899a7d348179a7844d0753d45751820e1b oid sha256:c888aceb88f0ef194bfbb8292d7e08772be5e4373b1e000d1ab28b7c4d5831db
size 9716336 size 9848222

16
libvirt.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Mon Apr 4 16:02:23 MDT 2011 - jfehlig@novell.com
- Update to libvirt 0.9.0 final
- Support cpu usage tuning
- Add public APIs for storage volume upload/download
- Add public API for setting migration speed on the fly
- Add libxenlight driver
- qemu: support migration to fd
- add virDomain{Get,Set}BlkioParameters
- introduce a new libvirt API (virDomainSetMemoryFlags)
- Expose event loop implementation as a public API
- Dump the debug buffer to libvirtd.log on fatal signal
- Audit support
- Numerous enhancements and bug fixes
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 31 14:16:17 MST 2011 - jfehlig@novell.com Thu Mar 31 14:16:17 MST 2011 - jfehlig@novell.com

425
libvirt.spec
View File

@ -17,80 +17,166 @@
# norootforbuild # norootforbuild
# hypervisor drivers that run on local host # In the future, we may want a client only build, which will create a
%define with_xen 1 # libvirt.so only containing the generic RPC driver and the test driver,
%define with_qemu 1 # but no libvirtd
%define with_lxc 1 # For now, default to a full server + client build
%define with_vbox 1 %define client_only 0
%define with_openvz 0
%define with_uml 0 # Disable all server side drivers if client only build requested
%define with_one 0 %if %{client_only}
# hypervisor drivers that use a native remote protocol %define server_drivers 0
%define with_phyp 0
%define with_esx 1
# host drivers
%define with_network 1
%define with_storage_fs 1
%define with_storage_lvm 1
%define with_storage_iscsi 1
%define with_storage_disk 1
%define with_storage_mpath 1
%define with_numactl 1
%define with_selinux 1
%define with_apparmor 0
# options
%if 0%{?suse_version} >= 1140
%define with_yajl 1
%define with_netcf 1
%define with_macvtap 1
%define with_virtualport 1
%else %else
%define with_yajl 0 %define server_drivers 1
%define with_netcf 0
%define with_macvtap 0
%define with_virtualport 0
%endif
%if 0%{?suse_version} >= 1130
%define with_capng 1
%else
%define with_capng 0
%endif
%if 0%{?suse_version} > 1110
%define with_udev 1
%define with_hal 0
%else
%define with_udev 0
%define with_hal 1
%endif %endif
# Now set the defaults for all the important features, independent
# of any particular OS
# First the daemon itself
%define with_libvirtd 0%{!?_without_libvirtd:%{server_drivers}}
%define with_avahi 0%{!?_without_avahi:%{server_drivers}}
# Then the hypervisor drivers that run on local host
%define with_xen 0%{!?_without_xen:%{server_drivers}}
%define with_qemu 0%{!?_without_qemu:%{server_drivers}}
%define with_openvz 0%{!?_without_openvz:%{server_drivers}}
%define with_lxc 0%{!?_without_lxc:%{server_drivers}}
%define with_vbox 0%{!?_without_vbox:%{server_drivers}}
%define with_uml 0%{!?_without_uml:%{server_drivers}}
%define with_xenapi 0%{!?_without_xenapi:%{server_drivers}}
%define with_libxl 0%{!?_without_libxl:%{server_drivers}}
# Then the hypervisor drivers that talk a native remote protocol
%define with_phyp 0%{!?_without_phyp:0}
%define with_esx 0%{!?_without_esx:1}
%define with_vmware 0%{!?_without_vmware:1}
# Then the secondary host drivers
%define with_network 0%{!?_without_network:%{server_drivers}}
%define with_storage_fs 0%{!?_without_storage_fs:%{server_drivers}}
%define with_storage_lvm 0%{!?_without_storage_lvm:%{server_drivers}}
%define with_storage_iscsi 0%{!?_without_storage_iscsi:%{server_drivers}}
%define with_storage_disk 0%{!?_without_storage_disk:%{server_drivers}}
%define with_storage_mpath 0%{!?_without_storage_mpath:%{server_drivers}}
%define with_numactl 0%{!?_without_numactl:%{server_drivers}}
%define with_selinux 0%{!?_without_selinux:%{server_drivers}}
%define with_apparmor 0%{!?_without_apparmor:0}
# A few optional bits off by default, we enable later
%define with_polkit 0%{!?_without_polkit:0}
%define with_capng 0%{!?_without_capng:0}
%define with_netcf 0%{!?_without_netcf:0}
%define with_udev 0%{!?_without_udev:0}
%define with_hal 0%{!?_without_hal:0}
%define with_yajl 0%{!?_without_yajl:0}
%define with_nwfilter 0%{!?_without_nwfilter:0}
%define with_libpcap 0%{!?_without_libpcap:0}
%define with_macvtap 0%{!?_without_macvtap:0}
%define with_libnl 0%{!?_without_libnl:0}
%define with_audit 0%{!?_without_audit:0}
%define with_dtrace 0%{!?_without_dtrace:0}
%define with_cgconfig 0%{!?_without_cgconfig:0}
# Non-server/HV driver defaults which are always enabled
%define with_python 0%{!?_without_python:1}
%define with_sasl 0%{!?_without_sasl:1}
# Set the OS / architecture specific special cases
# Xen is available only on i386 x86_64 # Xen is available only on i386 x86_64
%ifnarch %ix86 x86_64 %ifnarch %ix86 x86_64
%define with_xen 0 %define with_xen 0
%endif %define with_libxl 0
# LXC and selinux are not available on anything < openSUSE 11.1
%if 0%{?suse_version} < 1110
%define with_lxc 0
%define with_selinux 0
%endif
# Enable phyp driver for IBM Power systems
%ifarch ppc64
%define with_phyp 1
%endif
# numactl only on x86_64 and ia64
%ifnarch x86_64 ia64
%define with_numactl 0
%endif
# SLES doesn't contain OpenVZ, VBox, UML, OpenNebula, or ESX
%if 0%{?sles_version}
%define with_openvz 0
%define with_vbox 0
%define with_uml 0
%define with_one 0
%define with_esx 0
%endif %endif
Name: libvirt # numactl only on x86_64 and ia64
BuildRequires: bridge-utils cyrus-sasl-devel device-mapper-devel fdupes gettext gnutls-devel iptables-devel libxml2-devel lvm2 ncurses-devel parted-devel pkg-config python-devel python-xml readline-devel util-linux xhtml-dtd %ifnarch x86_64 ia64
%define with_numactl 0
%endif
# SLES doesn't contain OpenVZ, VBox, UML, ESX, VMWare, or Citrix XenAPI
%if 0%{?sles_version}
%define with_openvz 0
%define with_vbox 0
%define with_uml 0
%define with_esx 0
%define with_vmware 0
%define with_xenapi 0
%endif
# Enable phyp driver for IBM Power systems
%ifarch ppc64
%define with_phyp 1
%endif
# LXC and selinux are not available on anything < openSUSE 11.1
%if 0%{?suse_version} < 1110
%define with_lxc 0
%define with_selinux 0
%endif
# udev is used to manage host devices in 11.1 or newer
%if 0%{?suse_version} > 1110
%define with_udev 0%{!?_without_udev:%{server_drivers}}
%else
%define with_hal 0%{!?_without_hal:%{server_drivers}}
%endif
# libcapng is used to manage capabilities in 11.3 or newer
%if 0%{?suse_version} >= 1130
%define with_capng 0%{!?_without_capng:1}
%endif
# netcf is used to manage network interfaces in 11.4 or newer
%if 0%{?suse_version} >= 1140
%define with_netcf 0%{!?_without_netcf:%{server_drivers}}
%endif
# Enable yajl library for JSON mode with QEMU in 11.4 or newer
%if 0%{?suse_version} >= 1140
%define with_yajl 0%{!?_without_yajl:%{server_drivers}}
%endif
# Enable libpcap library
%if %{with_qemu}
%if 0%{?suse_version} >= 1140
%define with_nwfilter 0%{!?_without_nwfilter:%{server_drivers}}
%define with_libpcap 0%{!?_without_libpcap:%{server_drivers}}
%define with_macvtap 0%{!?_without_macvtap:%{server_drivers}}
%endif
%endif
%if %{with_macvtap}
%define with_libnl 1
%endif
# there's no use compiling the network driver without
# the libvirt daemon
%if ! %{with_libvirtd}
%define with_network 0
%endif
BuildRequires: python-devel
BuildRequires: libxml2-devel
BuildRequires: xhtml-dtd
BuildRequires: libxslt
BuildRequires: readline-devel
BuildRequires: ncurses-devel
BuildRequires: gettext
BuildRequires: gnutls-devel
BuildRequires: bridge-utils
BuildRequires: fdupes
BuildRequires: pkg-config
BuildRequires: python-xml
# Only for directory ownership:
BuildRequires: gtk-doc
%if %{with_xen} || %{with_libxl}
BuildRequires: xen-devel
%endif
%if %{with_sasl}
BuildRequires: cyrus-sasl-devel
%endif
%if %{with_hal} %if %{with_hal}
BuildRequires: hal-devel BuildRequires: hal-devel
%endif %endif
@ -98,14 +184,13 @@ BuildRequires: hal-devel
BuildRequires: libudev-devel >= 145 BuildRequires: libudev-devel >= 145
BuildRequires: libpciaccess0-devel >= 0.10.9 BuildRequires: libpciaccess0-devel >= 0.10.9
%endif %endif
%if %{with_xen} %if %{with_avahi}
BuildRequires: xen-devel
%endif
%if 0%{?suse_version} > 1030 %if 0%{?suse_version} > 1030
BuildRequires: libavahi-devel BuildRequires: libavahi-devel
%else %else
BuildRequires: avahi-devel BuildRequires: avahi-devel
%endif %endif
%endif
%if %{with_selinux} %if %{with_selinux}
BuildRequires: libselinux-devel BuildRequires: libselinux-devel
%endif %endif
@ -115,11 +200,13 @@ BuildRequires: libapparmor-devel
%if %{with_numactl} %if %{with_numactl}
BuildRequires: libnuma-devel BuildRequires: libnuma-devel
%endif %endif
%if %{with_polkit}
%if 0%{?suse_version} > 1110 %if 0%{?suse_version} > 1110
BuildRequires: polkit >= 0.9 BuildRequires: polkit >= 0.9
%else %else
BuildRequires: PolicyKit-devel >= 0.6 BuildRequires: PolicyKit-devel >= 0.6
%endif %endif
%endif
%if %{with_phyp} %if %{with_phyp}
BuildRequires: libssh2-devel BuildRequires: libssh2-devel
%endif %endif
@ -133,13 +220,47 @@ BuildRequires: libnl-devel
BuildRequires: libcurl-devel BuildRequires: libcurl-devel
%endif %endif
%if %{with_capng} %if %{with_capng}
BuildRequires: libcap-ng-devel BuildRequires: libcap-ng-devel >= 0.5.0
%endif %endif
%if %{with_netcf} %if %{with_netcf}
BuildRequires: netcf-devel BuildRequires: netcf-devel >= 0.1.4
%endif %endif
# Only for directory ownership: %if %{with_network}
BuildRequires: gtk-doc BuildRequires: dnsmasq >= 2.41
BuildRequires: iptables-devel
BuildRequires: radvd
%endif
%if %{with_nwfilter}
BuildRequires: ebtables
%endif
%if %{with_libpcap}
BuildRequires: libpcap-devel
%endif
%if %{with_libnl}
BuildRequires: libnl-devel
%endif
%if %{with_storage_fs}
# For mount/umount in FS driver
BuildRequires: util-linux
%endif
%if %{with_storage_lvm}
# For LVM drivers
BuildRequires: lvm2
%endif
%if %{with_storage_iscsi}
# For ISCSI driver
BuildRequires: open-iscsi
%endif
%if %{with_storage_disk}
# For disk driver
BuildRequires: parted-devel
%endif
%if %{with_storage_mpath}
# For Multipath support
BuildRequires: device-mapper-devel
%endif
Name: libvirt
Url: http://libvirt.org/ Url: http://libvirt.org/
License: LGPLv2.1+ License: LGPLv2.1+
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
@ -147,25 +268,65 @@ AutoReqProv: yes
Version: 0.9.0 Version: 0.9.0
Release: 1 Release: 1
Summary: A C toolkit to interract with the virtualization capabilities of Linux Summary: A C toolkit to interract with the virtualization capabilities of Linux
# The client side, i.e. shared libs and virsh are in a subpackage # The client side, i.e. shared libs and virsh are in a subpackage
Requires: %{name}-client = %{version}-%{release} Requires: %{name}-client = %{version}-%{release}
Requires: parted
Requires: virt-utils Requires: virt-utils
# Used by many of the drivers, so turn it on whenever the
# daemon is present
%if %{with_libvirtd}
Recommends: bridge-utils Recommends: bridge-utils
# for modprobe of pci devices
Requires: module-init-tools
# for /sbin/ip
Requires: iproute
%endif
%if %{with_network}
Recommends: dnsmasq >= 2.41
Recommends: radvd
%endif
%if %{with_network} || %{with_nwfilter}
Recommends: iptables Recommends: iptables
Recommends: lvm2 %endif
%if %{with_nwfilter}
Recommends: ebtables
%endif
Recommends: logrotate Recommends: logrotate
Recommends: dnsmasq
Recommends: open-iscsi
Recommends: nfs-client Recommends: nfs-client
%if %{with_hal} %if %{with_hal}
Requires: hal Requires: hal
%endif %endif
%if %{with_udev}
Requires: udev >= 145
%endif
%if %{with_polkit}
%if 0%{?suse_version} > 1110 %if 0%{?suse_version} > 1110
Recommends: polkit >= 0.9 Recommends: polkit >= 0.9
%else %else
Recommends: PolicyKit >= 0.6 Recommends: PolicyKit >= 0.6
%endif %endif
%endif
%if %{with_storage_fs}
Recommends: nfs-utils
%endif
%if %{with_storage_lvm}
# For LVM drivers
Recommends: lvm2
%endif
%if %{with_storage_iscsi}
# For ISCSI driver
Recommends: open-iscsi
%endif
%if %{with_storage_disk}
# For disk driver
Recommends: parted
Recommends: device-mapper
%endif
%if %{with_storage_mpath}
# For multipath support
Recommends: device-mapper
%endif
Source0: %{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2
Source1: libvirtd.init Source1: libvirtd.init
# Upstream patches # Upstream patches
@ -202,11 +363,11 @@ Requires: readline
Requires: ncurses Requires: ncurses
# Needed by libvirt-guests init script. # Needed by libvirt-guests init script.
Requires: gettext Requires: gettext
Requires: cyrus-sasl
Recommends: cyrus-sasl-digestmd5
# So remote clients can access libvirt over SSH tunnel # So remote clients can access libvirt over SSH tunnel
# (client invokes 'nc' against the UNIX socket on the server) # (client invokes 'nc' against the UNIX socket on the server)
Recommends: netcat-openbsd Recommends: netcat-openbsd
Requires: cyrus-sasl
Recommends: cyrus-sasl-digestmd5
%description client %description client
Libvirt is a C toolkit to interract with the virtualization Libvirt is a C toolkit to interract with the virtualization
@ -226,10 +387,10 @@ License: LGPLv2.1+
Summary: A C toolkit to interract with the virtualization capabilities of Linux Summary: A C toolkit to interract with the virtualization capabilities of Linux
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %{name}-client = %{version}-%{release} libxml2-devel Requires: %{name}-client = %{version}-%{release} libxml2-devel
%if %{with_xen} Requires: pkg-config
%if %{with_xen} || %{with_libxl}
Requires: xen-devel Requires: xen-devel
%endif %endif
Requires: pkg-config
%description devel %description devel
Libvirt is a C toolkit to interract with the virtualization Libvirt is a C toolkit to interract with the virtualization
@ -261,6 +422,7 @@ Authors:
Daniel Veillard <veillard@redhat.com> Daniel Veillard <veillard@redhat.com>
Karel Zak <kzak@redhat.com> Karel Zak <kzak@redhat.com>
%if %{with_python}
%package python %package python
License: LGPLv2.1+ License: LGPLv2.1+
Summary: A C toolkit to interract with the virtualization capabilities of Linux Summary: A C toolkit to interract with the virtualization capabilities of Linux
@ -279,6 +441,7 @@ Authors:
-------- --------
Daniel Veillard <veillard@redhat.com> Daniel Veillard <veillard@redhat.com>
Karel Zak <kzak@redhat.com> Karel Zak <kzak@redhat.com>
%endif
%prep %prep
%setup -q %setup -q
@ -308,15 +471,15 @@ Authors:
%if ! %{with_uml} %if ! %{with_uml}
%define _without_uml --without-uml %define _without_uml --without-uml
%endif %endif
%if ! %{with_one}
%define _without_one --without-one
%endif
%if ! %{with_phyp} %if ! %{with_phyp}
%define _without_phyp --without-phyp %define _without_phyp --without-phyp
%endif %endif
%if ! %{with_esx} %if ! %{with_esx}
%define _without_esx --without-esx %define _without_esx --without-esx
%endif %endif
%if ! %{with_libxl}
%define _without_libxl --without-libxl
%endif
%if ! %{with_numactl} %if ! %{with_numactl}
%define _without_numactl --without-numactl %define _without_numactl --without-numactl
%endif %endif
@ -344,8 +507,20 @@ Authors:
%if ! %{with_macvtap} %if ! %{with_macvtap}
%define _without_macvtap --without-macvtap %define _without_macvtap --without-macvtap
%endif %endif
%if ! %{with_virtualport} %if ! %{with_polkit}
%define _without_virtualport --without-virtualport %define _without_polkit --without-polkit
%endif
%if ! %{with_network}
%define _without_network --without-network
%endif
%if ! %{with_sasl}
%define _without_sasl --without-sasl
%endif
%if ! %{with_python}
%define _without_python --without-python
%endif
%if ! %{with_libpcap}
%define _without_libpcap --without-libpcap
%endif %endif
autoreconf -f -i autoreconf -f -i
@ -357,26 +532,26 @@ export CFLAGS="$RPM_OPT_FLAGS"
%{?_without_openvz} \ %{?_without_openvz} \
%{?_without_vbox} \ %{?_without_vbox} \
%{?_without_uml} \ %{?_without_uml} \
%{?_without_one} \
%{?_without_phyp} \ %{?_without_phyp} \
%{?_without_esx} \ %{?_without_esx} \
%{?_without_libxl} \
%{?_without_numactl} \ %{?_without_numactl} \
%{?_with_selinux} \
%{?_without_capng} \
%{?_without_netcf} \
%{?_without_selinux} \ %{?_without_selinux} \
%{?_without_apparmor} \ %{?_without_apparmor} \
%{?_without_capng} \
%{?_without_netcf} \
%{?_without_network} \
%{?_without_hal} \ %{?_without_hal} \
%{?_without_udev} \ %{?_without_udev} \
%{?_without_yajl} \ %{?_without_yajl} \
%{?_without_macvtap} \ %{?_without_macvtap} \
%{?_without_virtualport} \ %{?_without_polkit} \
--without-xen-proxy \ %{?_without_network} \
%{?_without_sasl} \
%{?_without_python} \
%{?_without_libpcap} \
--libexecdir=%{_libdir}/%{name} \ --libexecdir=%{_libdir}/%{name} \
--with-init-script=none \
--with-remote-pid-file=%{_localstatedir}/run/libvirtd.pid \ --with-remote-pid-file=%{_localstatedir}/run/libvirtd.pid \
ac_cv_path_DNSMASQ=/usr/sbin/dnsmasq \
ac_cv_path_ISCSIADM=/sbin/iscsiadm \
ac_cv_path_MODPROBE=/sbin/modprobe \ ac_cv_path_MODPROBE=/sbin/modprobe \
ac_cv_path_UDEVADM=/sbin/udevadm \ ac_cv_path_UDEVADM=/sbin/udevadm \
ac_cv_path_SHOWMOUNT=/usr/sbin/showmount ac_cv_path_SHOWMOUNT=/usr/sbin/showmount
@ -388,10 +563,22 @@ cp -a AUTHORS ChangeLog COPYING NEWS README TODO $RPM_BUILD_ROOT%{_docdir}/%{nam
cd docs ; cp -a *.html $RPM_BUILD_ROOT%{_docdir}/%{name} ; cp -a *.png $RPM_BUILD_ROOT%{_docdir}/%{name} ; cd .. cd docs ; cp -a *.html $RPM_BUILD_ROOT%{_docdir}/%{name} ; cp -a *.png $RPM_BUILD_ROOT%{_docdir}/%{name} ; cd ..
# remove currently unsupported locale(s) # remove currently unsupported locale(s)
rm -rf $RPM_BUILD_ROOT/usr/share/locale/sr@latin rm -rf $RPM_BUILD_ROOT/usr/share/locale/sr@latin
# don't autostart the default network
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/libvirt mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/libvirt
rm $RPM_BUILD_ROOT%{_libdir}/*.*a $RPM_BUILD_ROOT%{py_sitedir}/*.*a rm $RPM_BUILD_ROOT%{_libdir}/*.*a $RPM_BUILD_ROOT%{py_sitedir}/*.*a
%find_lang %{name}
%if %{with_network}
install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/lib/libvirt/dnsmasq/
install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/
cp $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml \
$RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml
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
%endif
%if ! %{with_lxc} %if ! %{with_lxc}
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/lxc.conf rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/lxc.conf
rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_lxc.aug rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_lxc.aug
@ -405,7 +592,17 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.qemu
%if ! %{with_uml} %if ! %{with_uml}
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.uml rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.uml
%endif %endif
%find_lang %{name} %if ! %{with_python}
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-python-%{version}
%endif
%if %{client_only}
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version}
%endif
%if ! %{with_libvirtd}
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter
mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version}/html \
$RPM_BUILD_ROOT%{_datadir}/doc/libvirt-devel-%{version}/
%endif
ln_dupes() ln_dupes()
{ {
@ -434,49 +631,68 @@ rm -rf $RPM_BUILD_ROOT
%post %post
/sbin/ldconfig /sbin/ldconfig
%if %{with_libvirtd}
%if 0%{?sles_version} %if 0%{?sles_version}
%{fillup_and_insserv -f -y libvirtd} %{fillup_and_insserv -f -y libvirtd}
%endif %endif
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>," \
< %{_datadir}/libvirt/networks/default.xml \
> %{_sysconfdir}/libvirt/qemu/networks/default.xml
fi
%endif
%{fillup_only -n libvirt-guests} %{fillup_only -n libvirt-guests}
%preun %preun
%if %{with_libvirtd}
%stop_on_removal libvirtd %stop_on_removal libvirtd
%endif
%postun %postun
/sbin/ldconfig /sbin/ldconfig
%if %{with_libvirtd}
%restart_on_update libvirtd %restart_on_update libvirtd
%endif
%insserv_cleanup %insserv_cleanup
%post client -p /sbin/ldconfig %post client -p /sbin/ldconfig
%postun client -p /sbin/ldconfig %postun client -p /sbin/ldconfig
%if %{with_libvirtd}
%files %files
%defattr(-, root, root) %defattr(-, root, root)
%{_sbindir}/libvirtd %{_sbindir}/libvirtd
%dir %{_libdir}/%{name} %dir %{_libdir}/%{name}
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/
%if %{with_network}
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/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/
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart
%dir %{_datadir}/libvirt/networks/
%{_datadir}/libvirt/networks/default.xml
%endif
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/
%{_sysconfdir}/libvirt/nwfilter/*.xml %{_sysconfdir}/libvirt/nwfilter/*.xml
%config /etc/init.d/libvirtd %config /etc/init.d/libvirtd
%{_sbindir}/rclibvirtd %{_sbindir}/rclibvirtd
%config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd
%config %{_sysconfdir}/libvirt/qemu/networks/default.xml
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/
%dir %{_localstatedir}/lib/libvirt/ %dir %{_localstatedir}/lib/libvirt/
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/
%dir %attr(0700, root, root) %{_localstatedir}/cache/libvirt/ %dir %attr(0700, root, root) %{_localstatedir}/cache/libvirt/
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/ %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/
%if %{with_polkit}
%if 0%{?suse_version} > 1110 %if 0%{?suse_version} > 1110
%{_datadir}/polkit-1/actions/org.libvirt.unix.policy %{_datadir}/polkit-1/actions/org.libvirt.unix.policy
%else %else
%{_datadir}/PolicyKit/policy/org.libvirt.unix.policy %{_datadir}/PolicyKit/policy/org.libvirt.unix.policy
%endif %endif
%endif
%{_datadir}/augeas %{_datadir}/augeas
%if %{with_qemu} %if %{with_qemu}
%config(noreplace) %{_sysconfdir}/libvirt/qemu.conf %config(noreplace) %{_sysconfdir}/libvirt/qemu.conf
@ -497,11 +713,16 @@ rm -rf $RPM_BUILD_ROOT
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/uml/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/uml/
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/uml/ %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/uml/
%endif %endif
%if %{with_libxl}
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/
#%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/
%endif
%if 0%{with_storage_disk} %if 0%{with_storage_disk}
%{_libdir}/%{name}/libvirt_parthelper %{_libdir}/%{name}/libvirt_parthelper
%endif %endif
%{_libdir}/%{name}/libvirt_iohelper %{_libdir}/%{name}/libvirt_iohelper
%doc %{_mandir}/man8/libvirtd.8* %doc %{_mandir}/man8/libvirtd.8*
%endif
%files client -f %{name}.lang %files client -f %{name}.lang
%defattr(-, root, root) %defattr(-, root, root)
@ -534,7 +755,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/libvirt/cpu_map.xml %{_datadir}/libvirt/cpu_map.xml
%{_datadir}/libvirt/schemas/nwfilter.rng %{_datadir}/libvirt/schemas/nwfilter.rng
%{_datadir}/libvirt/schemas/domainsnapshot.rng %{_datadir}/libvirt/schemas/domainsnapshot.rng
%if %{with_sasl}
%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
%endif
%files devel %files devel
%defattr(-, root, root) %defattr(-, root, root)
@ -551,10 +774,12 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_docdir}/%{name}/*.css %doc %{_docdir}/%{name}/*.css
%doc %{_docdir}/%{name}/html %doc %{_docdir}/%{name}/html
%if %{with_python}
%files python %files python
%defattr(-, root, root) %defattr(-, root, root)
%doc %{_docdir}/%{name}-python %doc %{_docdir}/%{name}-python
%{py_sitedir}/libvirt.py* %{py_sitedir}/libvirt.py*
%{py_sitedir}/libvirtmod* %{py_sitedir}/libvirtmod*
%endif
%changelog %changelog