]> TLD Linux GIT Repositories - packages/libvirt.git/blobdiff - libvirt.spec
- updated to 8.4.0
[packages/libvirt.git] / libvirt.spec
index aacb4a8f980caa4ac20ac2971c261679d361414d..24de28bebf7ef8127c9e6d58c260192cbdff3b11 100644 (file)
@@ -4,6 +4,7 @@
 #
 # Conditional build:
 # - virtualization
+%bcond_without ch              # Cloud-Hypervisor support
 %bcond_without esx             # VMware ESX support
 %bcond_without hyperv          # Hyper-V support
 %bcond_without libxl           # libxenlight support
 %bcond_without openvz          # OpenVZ support
 %bcond_without phyp            # PHYP support
 %bcond_without qemu            # Qemu support
-%bcond_without uml             # UML support
 %bcond_without vbox            # VirtualBox support
 %bcond_without vmware          # VMware Workstation/Player support
-%bcond_without xenapi          # Xen API (Citrix XenServer) support
 # - storage
 %bcond_without ceph            # RADOS BD (Ceph) storage support
 %bcond_without glusterfs       # GlusterFS storage support
 # - storage locking
 %bcond_without sanlock         # sanlock storage lock manager
 # - other
+%bcond_with    apparmor        # apparmor support
 %bcond_without netcf           # host interfaces support
 %bcond_without polkit          # PolicyKit support
 %bcond_without systemtap       # systemtap/dtrace probes
 %bcond_with    wireshark       # wireshark dissector module
-%bcond_without static_libs     # static libraries build
 
 # qemu available only on x86 and ppc
 %ifnarch %{ix86} %{x8664} ppc
 
 # Xen is available only on x86 and ia64
 %ifnarch %{ix86} %{x8664} ia64
-%undefine      with_xenapi
 %undefine      with_libxl
 %endif
 
+# Cloud-Hypervisor is available only on x86_64
+%ifnarch %{x8664}
+%undefine      with_ch
+%endif
+
+# ceph >= 14.0 no longer support 32-bit archs
+%ifarch %{ix86}
+%undefine      with_ceph
+%endif
+
 Summary:       Toolkit to interact with virtualization capabilities
 Summary(pl.UTF-8):     Narzędzia współpracujące z funkcjami wirtualizacji
 Name:          libvirt
-Version:       4.5.0
-Release:       2
+Version:       8.4.0
+Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://libvirt.org/sources/libvirt-%{version}.tar.xz
-# Source0-md5: 692b2d00907438ed08a68813d3177cd3
+# Source0-md5: d9ffa11bc1dcbf5aca13271f3248d3f7
 Source1:       libvirtd.init
 Source2:       virtlockd.init
 Source3:       virtlogd.init
+Source4:       libvirt-guests.init
+Source5:       libvirtd.sysconfig
+Source6:       virtlockd.sysconfig
+Source7:       virtlogd.sysconfig
+Source8:       libvirt-guests.sysconfig
 Patch0:                %{name}-sasl.patch
 Patch1:                %{name}-qemu-acl.patch
 Patch2:                %{name}-udevadm-settle.patch
 Patch3:                bashisms.patch
-Patch4:                %{name}-guests.init.patch
-Patch5:                %{name}-sysctl-dir.patch
+Patch4:                %{name}-sysctl-dir.patch
 URL:           http://www.libvirt.org/
 BuildRequires: acl-devel
 BuildRequires: attr-devel
@@ -63,65 +75,72 @@ BuildRequires:      audit-libs-devel
 BuildRequires: augeas-devel
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
-BuildRequires: avahi-devel >= 0.6.0
 BuildRequires: bash-completion >= 2.0
 %{?with_ceph:BuildRequires:    ceph-devel}
-BuildRequires: curl-devel >= 7.18.0
-BuildRequires: cyrus-sasl-devel
+BuildRequires: curl-devel >= 7.19.1
+BuildRequires: cyrus-sasl-devel >= 2.1.26
 BuildRequires: dbus-devel >= 1.0.0
 BuildRequires: device-mapper-devel >= 1.0.0
 BuildRequires: gawk
 BuildRequires: gcc >= 6:4.4
 BuildRequires: gettext-tools >= 0.17
+BuildRequires: glib2-devel >= 2.56.0
 %{?with_glusterfs:BuildRequires:       glusterfs-devel >= 3.4.1}
-BuildRequires: gnutls-devel >= 2.2.0
-BuildRequires: libapparmor-devel
+BuildRequires: gnutls-devel >= 3.2.0
+%{?with_apparmor:BuildRequires:        libapparmor-devel}
 BuildRequires: libblkid-devel >= 2.17
 BuildRequires: libcap-ng-devel >= 0.4.0
 BuildRequires: libfuse-devel >= 2.8.6
 BuildRequires: libgcrypt-devel
+BuildRequires: libiscsi-devel >= 1.18.0
 BuildRequires: libnl-devel >= 3.2
-BuildRequires: libpcap-devel >= 1.0.0
+BuildRequires: libpcap-devel >= 1.5.0
 BuildRequires: libselinux-devel >= 2.5
 BuildRequires: libssh-devel >= 0.7
 BuildRequires: libssh2-devel >= 1.3
 BuildRequires: libtool
-%{?with_xenapi:BuildRequires:  libxenserver-devel}
-BuildRequires: libxml2-devel >= 1:2.6.0
+BuildRequires: libxml2-devel >= 1:2.9.1
 BuildRequires: libxslt-devel
+BuildRequires: lvm2
+BuildRequires: meson >= 0.54.0
 BuildRequires: ncurses-devel
 %{?with_netcf:BuildRequires:   netcf-devel >= 0.2.0}
-BuildRequires: numactl-devel
-%{?with_hyperv:BuildRequires:  openwsman-devel >= 2.2.3}
+BuildRequires: numactl-devel >= 2.0.6
+BuildRequires: open-iscsi
+%{?with_hyperv:BuildRequires:  openwsman-devel >= 2.6.3}
 BuildRequires: parted-devel >= 1.8.0
 BuildRequires: pkgconfig
 %{?with_polkit:BuildRequires:  polkit}
 %{?with_polkit:BuildRequires:  polkit-devel >= 0.90}
-BuildRequires: readline-devel
-BuildRequires: rpmbuild(macros) >= 1.627
+BuildRequires: readline-devel >= 7.0
+BuildRequires: rpcsvc-proto
+BuildRequires: rpmbuild(macros) >= 1.753-5
 %{?with_sanlock:BuildRequires: sanlock-devel >= 0.8}
+BuildRequires: sheepdog
 %{?with_systemtap:BuildRequires:       systemtap-sdt-devel}
-BuildRequires: udev-devel >= 1:218
-%{?with_wireshark:BuildRequires:       wireshark-devel >= 1.11.3}
-%{?with_libxl:BuildRequires:   xen-devel >= 4.4}
+BuildRequires: udev-devel >= 1:219
+%{?with_wireshark:BuildRequires:       wireshark-devel >= 2.6.0}
+%{?with_libxl:BuildRequires:   xen-devel >= 4.6.0}
 # For disk driver
 BuildRequires: xorg-lib-libpciaccess-devel >= 0.10.0
-BuildRequires: yajl-devel
+BuildRequires: yajl-devel >= 2.0.3
+BuildRequires: zfs
+BuildRequires: zfs-devel
 Requires:      curl-libs >= 7.18.0
 Requires:      device-mapper >= 1.0.0
 Requires:      libcap-ng >= 0.4.0
 Requires:      libnl >= 3.2
-Requires:      libpcap >= 1.0.0
+Requires:      libpcap >= 1.5.0
 Requires:      libselinux >= 2.5
 Requires:      libssh >= 0.7
 Requires:      libssh2 >= 1.3
-Requires:      libxml2 >= 1:2.6.0
-%{?with_hyperv:Requires:       openwsman-libs >= 2.2.3}
+Requires:      libxml2 >= 1:2.9.1
+%{?with_hyperv:Requires:       openwsman-libs >= 2.6.3}
 Obsoletes:     libvirt-daemon-esx
 Obsoletes:     libvirt-daemon-hyperv
 Obsoletes:     libvirt-daemon-openvz
 Obsoletes:     libvirt-daemon-phyp
-Obsoletes:     libvirt-daemon-vbox
+Obsoletes:     libvirt-daemon-uml
 Obsoletes:     libvirt-daemon-vmware
 Obsoletes:     libvirt-daemon-xen
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -173,17 +192,16 @@ Requires: audit-libs-devel
 Requires:      curl-devel >= 7.18.0
 Requires:      dbus-devel >= 1.0.0
 Requires:      device-mapper-devel >= 1.0.0
-Requires:      gnutls-devel >= 2.2.0
-Requires:      libapparmor-devel
+Requires:      gnutls-devel >= 3.2.0
+%{?with_apparmor:Requires:     libapparmor-devel}
 Requires:      libcap-ng-devel >= 0.4.0
 Requires:      libgcrypt-devel
 Requires:      libnl-devel >= 3.2
-Requires:      libpcap-devel >= 1.0.0
+Requires:      libpcap-devel >= 1.5.0
 Requires:      libselinux-devel >= 2.5
-Requires:      libxml2-devel >= 1:2.6.0
-Requires:      numactl-devel
-%{?with_hyperv:Requires:       openwsman-devel >= 2.2.3}
-Requires:      yajl-devel
+Requires:      libxml2-devel >= 1:2.9.1
+Requires:      numactl-devel >= 2.0.6
+%{?with_hyperv:Requires:       openwsman-devel >= 2.6.3}
 
 %description devel
 Libvirt is a C toolkit to interact with the virtualization
@@ -199,26 +217,6 @@ obecnych wersji Linuksa.
 Ten pakiet zawiera pliki nagłówkowe potrzebne do tworzenia programów
 wykorzystujących bibliotekę libvirt.
 
-%package static
-Summary:       Development static libraries for programs using libvirt
-Summary(pl.UTF-8):     Statyczne biblioteki programistyczne do programów wykorzystujących libvirt
-Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}-%{release}
-
-%description static
-Libvirt is a C toolkit to interact with the virtualization
-capabilities of recent versions of Linux.
-
-This package contains the static libraries for developing programs
-using the libvirt library.
-
-%description static -l pl.UTF-8
-Libvirt to zestaw narzędzi w C do współpracy z funkcjami wirtualizacji
-obecnych wersji Linuksa.
-
-Ten pakiet zawiera biblioteki statyczne do tworzenia programów
-wykorzystujących bibliotekę libvirt.
-
 %package lock-sanlock
 Summary:       Sanlock lock manager plugin for libvirt
 Summary(pl.UTF-8):     Zarządca blokad sanlock dla biblioteki libvirt
@@ -236,7 +234,6 @@ Summary:    Server side daemon and supporting files for libvirt library
 Summary(pl.UTF-8):     Demon działający po stronie serwera oraz pliki wspierające dla biblioteki libvirt
 Group:         Applications/System
 Requires:      %{name} = %{version}-%{release}
-Requires:      avahi-libs >= 0.6.0
 Requires:      iproute2
 Requires:      libblkid >= 2.17
 %{?with_netcf:Requires:        netcf >= 0.2.0}
@@ -306,12 +303,26 @@ Storage driver plugin for Ceph RADOS Block Device.
 Wtyczka składowania danych wykorzystująca urządzenie blokowe RADOS
 (system plików Ceph).
 
+%package daemon-ch
+Summary:       Server side driver required to run Cloud-Hypervisor
+Summary(pl.UTF-8):     Sterownik wymagany po stronie serwera do uruchamiania gości Cloud-Hypervisor
+Group:         Libraries
+Requires:      %{name}-daemon = %{version}-%{release}
+Provides:      libvirt(hypervisor)
+
+%description daemon-ch
+Server side driver required to manage the virtualization capabilities
+of Cloud-Hypervisor.
+
+%description daemon-ch -l pl.UTF-8
+Sterownik wymagany po stronie serwera do zarządzania funkcjami
+wirtualizacji Cloud-Hypervisor.
+
 %package daemon-libxl
 Summary:       Server side driver required to run XEN guests (xenlight)
 Summary(pl.UTF-8):     Sterownik wymagany po stronie serwera do uruchamiania gości XEN (xenlight)
 Group:         Libraries
 Requires:      %{name}-daemon = %{version}-%{release}
-Requires:      /usr/sbin/qcow-create
 Requires:      xen >= 4.4
 Provides:      libvirt(hypervisor)
 
@@ -360,20 +371,19 @@ of the QEMU emulators.
 Sterownik wymagany po stronie serwera do zarządzania funkcjami
 wirtualizacji emulatora QEMU.
 
-%package daemon-uml
-Summary:       Server side driver required to run UML guests
-Summary(pl.UTF-8):     Sterownik wymagany po stronie serwera do uruchamiania gości UML
+%package daemon-vbox
+Summary:       Server side driver required to run Oracle VirtualBox guests
+Summary(pl.UTF-8):     Sterownik wymagany po stronie serwera do uruchamiania gości Oracle VirtualBox
 Group:         Libraries
-Requires:      %{name}-daemon = %{version}-%{release}
 Provides:      libvirt(hypervisor)
 
-%description daemon-uml
+%description daemon-vbox
 Server side driver required to manage the virtualization capabilities
-of UML.
+of Oracle VirtualBox
 
-%description daemon-uml -l pl.UTF-8
+%description daemon-vbox -l pl.UTF-8
 Sterownik wymagany po stronie serwera do zarządzania funkcjami
-wirtualizacji UML.
+wirtualizacji emulatora Oracle VirtualBox.
 
 %package client
 Summary:       Client side utilities of the libvirt library
@@ -381,7 +391,7 @@ Summary(pl.UTF-8):  Narzędzia klienckie do biblioteki libvirt
 Group:         Applications/System
 Requires:      %{name} = %{version}-%{release}
 Requires:      gettext >= 0.18.1.1-6
-Requires:      gnutls >= 2.2.0
+Requires:      gnutls >= 3.2.0
 Requires:      netcat-openbsd
 Requires:      rc-scripts
 Requires(post,preun):  /sbin/chkconfig
@@ -400,10 +410,10 @@ Summary(pl.UTF-8):        Narzędzia do współpracy z funkcjami wirtualizacyjnymi (met
 Group:         Applications/System
 Requires:      %{name}-client = %{version}-%{release}
 Requires:      %{name}-daemon = %{version}-%{release}
+Requires:      %{name}-daemon-ch = %{version}-%{release}
 %{?with_libxl:Requires:        %{name}-daemon-libxl = %{version}-%{release}}
 Requires:      %{name}-daemon-lxc = %{version}-%{release}
 Requires:      %{name}-daemon-qemu = %{version}-%{release}
-%{?with_uml:Requires:  %{name}-daemon-uml = %{version}-%{release}}
 
 %description utils
 Libvirt is a C toolkit to interact with the virtualization
@@ -450,134 +460,95 @@ Moduł sekcji Wiresharka do pakietów libvirt.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %build
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-
-%configure \
-       PVCREATE=/sbin/pvcreate \
-       VGCREATE=/sbin/vgcreate \
-       LVCREATE=/sbin/lvcreate \
-       PVREMOVE=/sbin/pvremove \
-       VGREMOVE=/sbin/vgremove \
-       LVREMOVE=/sbin/lvremove \
-       VGCHANGE=/sbin/vgchange \
-       LVCHANGE=/sbin/lvchange \
-         VGSCAN=/sbin/vgscan   \
-            PVS=/sbin/pvs      \
-            VGS=/sbin/vgs      \
-            LVS=/sbin/lvs      \
-             TC=/sbin/tc \
-          BRCTL=/sbin/brctl    \
-       ISCSIADM=/sbin/iscsiadm \
-       SHOWMOUNT=/usr/sbin/showmount \
-       MOUNT=/bin/mount \
-       UMOUNT=/bin/umount \
-       MKFS=/sbin/mkfs \
-       SHOWMOUNT=/usr/sbin/showmount \
-       IPTABLES_PATH=/usr/sbin/iptables \
-       IP6TABLES_PATH=/usr/sbin/ip6tables \
-       EBTABLES_PATH=/usr/sbin/ebtables \
-       ISCSIADM=/sbin/iscsiadm \
-       DNSMASQ=/usr/sbin/dnsmasq \
-       RADVD=/usr/sbin/radvd \
-       UDEVADM=/sbin/udevadm \
-       MODPROBE=/sbin/modprobe \
-       SCRUB=/usr/bin/scrub \
-       OVSVSCTL=/usr/bin/ovs-vsctl \
-       NUMAD=/usr/bin/numad \
-       SHEEPDOGCLI=/usr/sbin/collie \
-       ZFS=/usr/sbin/zfs \
-       ZPOOL=/usr/sbin/zpool \
-       --disable-silent-rules \
-       %{?with_static_libs:--enable-static} \
-       --with-bash-completion \
-       --with-bash-completions-dir=/etc/bash_completion.d \
-       --with-html-dir=%{_gtkdocdir} \
-       --with-html-subdir=%{name} \
-       --with-init-script=redhat \
-       --with-packager="TLD-Linux" \
-       --with-packager-version="%{name}-%{version}-%{release}.%{_target_cpu}" \
-       --with-qemu-user=qemu \
-       --with-qemu-group=qemu \
-       --with-storage-disk \
-       --with-storage-fs \
-       --with-storage-gluster%{!?with_glusterfs:=no} \
-       --with-storage-iscsi \
-       --with-storage-lvm \
-       --with-storage-mpath \
-       --with-storage-rbd%{!?with_ceph:=no} \
-       --with-storage-scsi \
-       --with-storage-sheepdog \
-       --with-apparmor \
-       --with-audit \
-       --with-avahi \
-       %{__with_without systemtap dtrace} \
-       %{__with_without esx} \
-       --with-driver-modules \
-       --without-hal \
-       %{__with_without hyperv} \
-       --with-blkid \
-       --with-ssh2 \
-       %{__with_without libxl} \
-       %{__with_without lxc} \
-       --with-macvtap \
-       %{__with_without netcf} \
-       --with-numactl \
-       --with-numad \
-       %{__with_without openvz} \
-       %{__with_without phyp} \
-       %{__with_without polkit} \
-       %{__with_without qemu} \
-       %{__with_without sanlock} \
-       --with-sasl \
-       --with-selinux \
-       --with-udev \
-       %{__with_without uml} \
-       %{__with_without vbox vbox %{_libdir}/VirtualBox} \
-       --with-virtualport \
-       %{__with_without vmware} \
-       %{!?with_wireshark:--without-wireshark-dissector} \
-       %{__with_without xenapi} \
-       --with-yajl \
-       --x-libraries=%{_libdir}
-
-%{__make} \
-       AWK=gawk
+%meson build \
+       -Dpackager="TLD-Linux" \
+       -Dpackager_version="%{name}-%{version}-%{release}.%{_target_cpu}" \
+       -Dqemu_user=qemu \
+       -Dqemu_group=qemu \
+       -Dapparmor=%{__enabled_disabled apparmor} \
+       -Dapparmor_profiles=%{__enabled_disabled apparmor} \
+       -Dattr=enabled \
+       -Daudit=enabled \
+       -Dbash_completion=enabled \
+       -Dbash_completion_dir=/etc/bash_completion.d \
+       -Dblkid=enabled \
+       -Dcapng=enabled \
+       -Dcurl=enabled \
+       -Ddtrace=%{__enabled_disabled systemtap} \
+       -Dfirewalld=disabled \
+       -Dfirewalld_zone=disabled \
+       -Dfuse=enabled \
+       -Dglusterfs=%{__enabled_disabled glusterfs} \
+       -Dlibiscsi=enabled \
+       -Dlibnl=enabled \
+       -Dlibpcap=enabled \
+       -Dlibssh=enabled \
+       -Dlibssh2=enabled \
+       -Dnetcf=%{__enabled_disabled netcf} \
+       -Dnls=enabled \
+       -Dnumactl=enabled \
+       -Dnumad=disabled \
+       -Dopenwsman=enabled \
+       -Dpciaccess=enabled \
+       -Dpolkit=%{__enabled_disabled polkit} \
+       -Dreadline=enabled \
+       -Dsanlock=enabled \
+       -Dsasl=enabled \
+       -Dselinux=enabled \
+       -Dsysctl_config=enabled \
+       -Dudev=enabled \
+       -Dwireshark_dissector=%{__enabled_disabled wireshark} \
+       -Dyajl=enabled \
+       -Dstorage_dir=enabled \
+       -Dstorage_disk=enabled \
+       -Dstorage_fs=enabled \
+       -Dstorage_glusterfs=%{__enabled_disabled glusterfs} \
+       -Dstorage_iscsi=enabled \
+       -Dstorage_iscsi_direct=enabled \
+       -Dstorage_lvm=enabled \
+       -Dstorage_mpath=enabled \
+       -Dstorage_rbd=%{__enabled_disabled ceph} \
+       -Dstorage_scsi=enabled \
+       -Dstorage_sheepdog=enabled \
+       -Dstorage_vstorage=disabled \
+       -Dstorage_zfs=enabled \
+       -Ddriver_bhyve=disabled \
+       -Ddriver_ch=%{__enabled_disabled ch} \
+       -Ddriver_esx=%{__enabled_disabled esx} \
+       -Ddriver_hyperv=%{__enabled_disabled hyperv} \
+       -Ddriver_interface=enabled \
+       -Ddriver_libvirtd=enabled \
+       -Ddriver_libxl=%{__enabled_disabled libxl} \
+       -Ddriver_lxc=%{__enabled_disabled lxc} \
+       -Ddriver_network=enabled \
+       -Ddriver_openvz=%{__enabled_disabled openvz} \
+       -Ddriver_qemu=%{__enabled_disabled qemu} \
+       -Ddriver_remote=enabled \
+       -Ddriver_secrets=enabled \
+       -Ddriver_vbox=%{__enabled_disabled vbox} \
+       -Ddriver_vmware=%{__enabled_disabled vmware} \
+       -Ddriver_vz=disabled \
+       -Dsecdriver_apparmor=%{__enabled_disabled apparmor} \
+       -Dsecdriver_selinux=enabled
+
+%meson_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{sysconfig,sysctl.d,rc.d/init.d}
 
-%{__make} install \
-       DEVHELP_DIR=%{_gtkdocdir}/%{name}/devhelp \
-       DESTDIR=$RPM_BUILD_ROOT
+%meson_install -C build
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/libvirtd
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/virtlockd
 install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/virtlogd
-
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.la \
-       %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.a}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/storage-backend/*.la \
-       %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/storage-backend/*.a}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/storage-file/*.la \
-       %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/storage-file/*.a}
-
-%if %{with sanlock}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.la \
-       %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.a}
-%endif
-%if %{with wireshark}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.la \
-       %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.a} \
-%endif
+install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/libvirt-guests
+install -p %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/libvirtd
+install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/virtlockd
+install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/sysconfig/virtlogd
+install -p %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/libvirt-guests
 
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/locale/{bal,ilo,kw@kkcor,kw@uccor,kw_GB,tw,wba}
 
@@ -620,8 +591,11 @@ fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README.md
+%doc AUTHORS.rst NEWS.rst README.rst
 %dir %{_sysconfdir}/libvirt
+%if %{with apparmor}
+%dir %{_sysconfdir}/apparmor.d/libvirt
+%endif
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libvirt.conf
 %attr(755,root,root) %{_libdir}/libvirt.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libvirt.so.0
@@ -645,7 +619,6 @@ fi
 %defattr(644,root,root,755)
 /etc/bash_completion.d/virsh
 /etc/bash_completion.d/virt-admin
-/etc/bash_completion.d/vsh
 
 %files devel
 %defattr(644,root,root,755)
@@ -654,7 +627,7 @@ fi
 %{?with_lxc:%attr(755,root,root) %{_libdir}/libvirt-lxc.so}
 %attr(755,root,root) %{_libdir}/libvirt-qemu.so
 %{_datadir}/%{name}/api
-%{_gtkdocdir}/%{name}
+%{_docdir}/%{name}
 %{_includedir}/%{name}
 %{_pkgconfigdir}/libvirt.pc
 %{_pkgconfigdir}/libvirt-admin.pc
@@ -663,13 +636,6 @@ fi
 %{_mandir}/man7/virkeycode-*.7*
 %{_mandir}/man7/virkeyname-*.7*
 
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libvirt.a
-%{_libdir}/libvirt-admin.a
-%{?with_lxc:%{_libdir}/libvirt-lxc.a}
-%{_libdir}/libvirt-qemu.a
-
 %if %{with sanlock}
 %files lock-sanlock
 %defattr(644,root,root,755)
@@ -677,7 +643,9 @@ fi
 %attr(755,root,root) %{_libexecdir}/libvirt_sanlock_helper
 %attr(755,root,root) %{_libdir}/libvirt/lock-driver/sanlock.so
 %{_datadir}/augeas/lenses/libvirt_sanlock.aug
+%if %{with qemu}
 %{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
+%endif
 %dir /var/lib/libvirt/sanlock
 %{_mandir}/man8/virt-sanlock-cleanup.8*
 %endif
@@ -693,6 +661,13 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtlockd.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libvirt-admin.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtlogd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtinterfaced.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtnetworkd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtnodedevd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtnwfilterd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtproxyd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtsecretd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtstoraged.conf
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu/networks/default.xml
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/nwfilter/*.xml
@@ -704,29 +679,65 @@ fi
 %attr(754,root,root) /etc/rc.d/init.d/virtlockd
 %attr(754,root,root) /etc/rc.d/init.d/virtlogd
 %config(noreplace) %verify(not md5 mtime size) /etc/sysctl.d/60-libvirtd.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/sysctl.d/60-qemu-postcopy-migration.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd
+%if %{with apparmor}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor.d/local/usr.lib.libvirt.virt-aa-helper
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor.d/usr.lib.libvirt.virt-aa-helper
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor.d/usr.sbin.libvirtd
+%endif
 %attr(755,root,root) %{_libexecdir}/libvirt_iohelper
 %attr(755,root,root) %{_libexecdir}/libvirt_parthelper
+%if %{with apparmor}
 %attr(755,root,root) %{_libexecdir}/virt-aa-helper
+%endif
 %attr(755,root,root) %{_sbindir}/libvirtd
 %attr(755,root,root) %{_sbindir}/virtlockd
 %attr(755,root,root) %{_sbindir}/virtlogd
+%attr(755,root,root) %{_sbindir}/virtinterfaced
+%attr(755,root,root) %{_sbindir}/virtnetworkd
+%attr(755,root,root) %{_sbindir}/virtnodedevd
+%attr(755,root,root) %{_sbindir}/virtnwfilterd
+%attr(755,root,root) %{_sbindir}/virtproxyd
+%attr(755,root,root) %{_sbindir}/virtsecretd
+%attr(755,root,root) %{_sbindir}/virtstoraged
 %{_datadir}/augeas/lenses/libvirtd.aug
 %{_datadir}/augeas/lenses/libvirt_lockd.aug
 %{_datadir}/augeas/lenses/virtlockd.aug
 %{_datadir}/augeas/lenses/virtlogd.aug
+%{_datadir}/augeas/lenses/virtinterfaced.aug
+%{_datadir}/augeas/lenses/virtnetworkd.aug
+%{_datadir}/augeas/lenses/virtnodedevd.aug
+%{_datadir}/augeas/lenses/virtnwfilterd.aug
+%{_datadir}/augeas/lenses/virtproxyd.aug
+%{_datadir}/augeas/lenses/virtsecretd.aug
+%{_datadir}/augeas/lenses/virtstoraged.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd.aug
 %{?with_qemu:%{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug}
 %{_datadir}/augeas/lenses/tests/test_virtlockd.aug
 %{_datadir}/augeas/lenses/tests/test_virtlogd.aug
+%{_datadir}/augeas/lenses/tests/test_virtinterfaced.aug
+%{_datadir}/augeas/lenses/tests/test_virtnetworkd.aug
+%{_datadir}/augeas/lenses/tests/test_virtnodedevd.aug
+%{_datadir}/augeas/lenses/tests/test_virtnwfilterd.aug
+%{_datadir}/augeas/lenses/tests/test_virtproxyd.aug
+%{_datadir}/augeas/lenses/tests/test_virtsecretd.aug
+%{_datadir}/augeas/lenses/tests/test_virtstoraged.aug
 %if %{with polkit}
 %{_datadir}/polkit-1/actions/org.libvirt.api.policy
 %{_datadir}/polkit-1/actions/org.libvirt.unix.policy
 %{_datadir}/polkit-1/rules.d/50-libvirt.rules
 %endif
 %{_mandir}/man8/libvirtd.8*
+%{_mandir}/man8/virtinterfaced.8*
 %{_mandir}/man8/virtlockd.8*
 %{_mandir}/man8/virtlogd.8*
+%{_mandir}/man8/virtnetworkd.8*
+%{_mandir}/man8/virtnodedevd.8*
+%{_mandir}/man8/virtnwfilterd.8*
+%{_mandir}/man8/virtproxyd.8*
+%{_mandir}/man8/virtsecretd.8*
+%{_mandir}/man8/virtstoraged.8*
 %dir /var/lib/libvirt
 %dir /var/lib/libvirt/dnsmasq
 %attr(711,root,root) %dir /var/lib/libvirt/boot
@@ -739,20 +750,20 @@ fi
 %dir /var/run/libvirt/network
 %attr(755,root,root) %{_libexecdir}/libvirt_leaseshelper
 %dir %{_libdir}/libvirt/connection-driver
-%{_datadir}/libvirt/cpu_map.xml
+%{_datadir}/libvirt/cpu_map
 %{?with_netcf:%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_interface.so}
 %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_network.so
 %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_nodedev.so
 %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_nwfilter.so
 %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_secret.so
 %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_storage.so
-%{?with_vbox:%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_vbox.so}
 %dir %{_libdir}/libvirt/lock-driver
 %attr(755,root,root) %{_libdir}/libvirt/lock-driver/lockd.so
 %dir %{_libdir}/libvirt/storage-backend
 %attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_disk.so
 %attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_fs.so
 %attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_iscsi.so
+%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_iscsi-direct.so
 %attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_logical.so
 # mpath requires libdevmapper, but libvirt itself requires it too
 %attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_mpath.so
@@ -775,33 +786,57 @@ fi
 %attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_rbd.so
 %endif
 
+%if %{with ch}
+%files daemon-ch
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtchd.conf
+%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_ch.so
+%attr(755,root,root) %{_sbindir}/virtchd
+%{_datadir}/augeas/lenses/virtchd.aug
+%{_datadir}/augeas/lenses/tests/test_virtchd.aug
+%endif
+
 %if %{with libxl}
 %files daemon-libxl
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libxl.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libxl-lockd.conf
 %{?with_sanlock:%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libxl-sanlock.conf}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtxend.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd.libxl
 %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_libxl.so
+%attr(755,root,root) %{_sbindir}/virtxend
 %{_datadir}/augeas/lenses/libvirtd_libxl.aug
+%{_datadir}/augeas/lenses/virtxend.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug
+%{_datadir}/augeas/lenses/tests/test_virtxend.aug
 %attr(700,root,root) %dir /var/lib/libvirt/libxl
 %attr(700,root,root) %dir /var/run/libvirt/libxl
 %attr(700,root,root) %dir /var/log/libvirt/libxl
+%{_mandir}/man8/virtxend.8*
 %endif
 
 %if %{with lxc}
 %files daemon-lxc
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/lxc.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtlxcd.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd.lxc
+%if %{with apparmor}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor.d/abstractions/libvirt-lxc
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor.d/libvirt/TEMPLATE.lxc
+%endif
 %attr(700,root,root) %dir /var/lib/libvirt/lxc
 %attr(700,root,root) %dir /var/run/libvirt/lxc
 %attr(700,root,root) %dir /var/log/libvirt/lxc
 %{_datadir}/augeas/lenses/libvirtd_lxc.aug
+%{_datadir}/augeas/lenses/virtlxcd.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug
+%{_datadir}/augeas/lenses/tests/test_virtlxcd.aug
 %attr(755,root,root) %{_libexecdir}/libvirt_lxc
 %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_lxc.so
+%attr(755,root,root) %{_sbindir}/virtlxcd
+%{_mandir}/man8/virtlxcd.8*
 %endif
 
 %if %{with qemu}
@@ -810,24 +845,34 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu-lockd.conf
 %{?with_sanlock:%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu-sanlock.conf}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtqemud.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd.qemu
+%if %{with apparmor}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor.d/abstractions/libvirt-qemu
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor.d/libvirt/TEMPLATE.qemu
+%endif
 %attr(750,qemu,qemu) %dir /var/cache/libvirt/qemu
 %attr(750,qemu,qemu) %dir /var/lib/libvirt/qemu
 %attr(700,root,root) %dir /var/log/libvirt/qemu
 %attr(700,root,root) %dir /var/run/libvirt/qemu
 %{_datadir}/augeas/lenses/libvirtd_qemu.aug
+%{_datadir}/augeas/lenses/virtqemud.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
+%{_datadir}/augeas/lenses/tests/test_virtqemud.aug
 %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_qemu.so
+%attr(755,root,root) %{_sbindir}/virtqemud
+%{_mandir}/man8/virtqemud.8*
 %endif
 
-%if %{with uml}
-%files daemon-uml
+%if %{with vbox}
+%files daemon-vbox
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_uml.so
-%config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd.uml
-%attr(700,root,root) %dir /var/lib/libvirt/uml
-%attr(700,root,root) %dir /var/run/libvirt/uml
-%attr(700,root,root) %dir /var/log/libvirt/uml
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtvboxd.conf
+%attr(755,root,root) %{_sbindir}/virtvboxd
+%{_datadir}/augeas/lenses/virtvboxd.aug
+%{_datadir}/augeas/lenses/tests/test_virtvboxd.aug
+%{?with_vbox:%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_vbox.so}
+%{_mandir}/man8/virtvboxd.8*
 %endif
 
 %files client
@@ -840,25 +885,40 @@ fi
 %attr(755,root,root) %{_bindir}/virt-host-validate
 %attr(4755,root,root) %{_bindir}/virt-login-shell
 %attr(755,root,root) %{_bindir}/virt-xml-validate
+%attr(755,root,root) %{_bindir}/virt-pki-query-dn
 %attr(755,root,root) %{_bindir}/virt-pki-validate
+%if %{with qemu}
+%attr(755,root,root) %{_bindir}/virt-qemu-run
+%endif
+%attr(755,root,root) %{_bindir}/virt-ssh-helper
 %attr(754,root,root) %{_libexecdir}/libvirt-guests.sh
+%{_libdir}/virt-login-shell-helper
 %{_mandir}/man1/virsh.1*
 %{_mandir}/man1/virt-admin.1*
 %{_mandir}/man1/virt-host-validate.1*
 %{_mandir}/man1/virt-login-shell.1*
 %{_mandir}/man1/virt-xml-validate.1*
+%{_mandir}/man1/virt-pki-query-dn.1*
 %{_mandir}/man1/virt-pki-validate.1*
+%if %{with qemu}
+%{_mandir}/man1/virt-qemu-run.1*
+%endif
+%{_mandir}/man8/virt-ssh-helper.8*
 %dir %{_datadir}/libvirt/schemas
 %{_datadir}/libvirt/schemas/basictypes.rng
 %{_datadir}/libvirt/schemas/capability.rng
+%{_datadir}/libvirt/schemas/cpu.rng
 %{_datadir}/libvirt/schemas/cputypes.rng
 %{_datadir}/libvirt/schemas/domain.rng
+%{_datadir}/libvirt/schemas/domainbackup.rng
 %{_datadir}/libvirt/schemas/domaincaps.rng
+%{_datadir}/libvirt/schemas/domaincheckpoint.rng
 %{_datadir}/libvirt/schemas/domaincommon.rng
 %{_datadir}/libvirt/schemas/domainsnapshot.rng
 %{_datadir}/libvirt/schemas/interface.rng
 %{_datadir}/libvirt/schemas/network.rng
 %{_datadir}/libvirt/schemas/networkcommon.rng
+%{_datadir}/libvirt/schemas/networkport.rng
 %{_datadir}/libvirt/schemas/nodedev.rng
 %{_datadir}/libvirt/schemas/nwfilter.rng
 %{_datadir}/libvirt/schemas/nwfilter_params.rng
@@ -866,6 +926,7 @@ fi
 %{_datadir}/libvirt/schemas/secret.rng
 %{_datadir}/libvirt/schemas/storagecommon.rng
 %{_datadir}/libvirt/schemas/storagepool.rng
+%{_datadir}/libvirt/schemas/storagepoolcaps.rng
 %{_datadir}/libvirt/schemas/storagevol.rng
 # for test driver (built into libvirt)
 %{_datadir}/libvirt/test-screenshot.png
@@ -884,5 +945,5 @@ fi
 %if %{with wireshark}
 %files -n wireshark-libvirt
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/wireshark/plugins/*/libvirt.so
+%attr(755,root,root) %{_libdir}/wireshark/plugins/*/epan/libvirt.so
 %endif