X-Git-Url: https://git.tld-linux.org/?p=packages%2Flibvirt.git;a=blobdiff_plain;f=libvirt.spec;h=280b0a7ab3f7ecbcef7ed1d86e10430766c035db;hp=6766c368d509c44bd774bb52776f682912ee76d8;hb=8318ff06bf9804545c877b5f5fcdbf83250439a4;hpb=fbb9ab96d6738f21cc7b5eb354ad24a6ecd635b5

diff --git a/libvirt.spec b/libvirt.spec
index 6766c36..280b0a7 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -1,28 +1,29 @@
 # TODO:
-# - wireshark-dissector
-# - seems that lxc patch is not needed anymore, verify that before removing
-# - pldize virtlockd.init
+# - parallels-sdk >= 7.0.22?
+# - virtuozzo storage?
 #
 # Conditional build:
-%bcond_without	ceph		# RADOS BD (Ceph) storage support
+# - virtualization
 %bcond_without	esx		# VMware ESX support
-%bcond_without	glusterfs	# GlusterFS storage support
 %bcond_without	hyperv		# Hyper-V support
 %bcond_without	libxl		# libxenlight support
 %bcond_without	lxc		# LXC support
-%bcond_without	netcf		# host interfaces support
 %bcond_without	openvz		# OpenVZ support
 %bcond_without	phyp		# PHYP support
-%bcond_without	polkit		# PolicyKit support
 %bcond_without	qemu		# Qemu support
-%bcond_without	sanlock		# sanlock storage lock manager
-%bcond_without	systemtap	# systemtap/dtrace probes
-%bcond_without	uml		# UML support
 %bcond_without	vbox		# VirtualBox support
 %bcond_without	vmware		# VMware Workstation/Player support
-%bcond_with	vserver		# Support for Linux-VServer guests
 %bcond_without	xenapi		# Xen API (Citrix XenServer) support
-%bcond_without	xen		# Xen 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_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
@@ -32,7 +33,6 @@
 
 # Xen is available only on x86 and ia64
 %ifnarch %{ix86} %{x8664} ia64
-%undefine	with_xen
 %undefine	with_xenapi
 %undefine	with_libxl
 %endif
@@ -40,37 +40,44 @@
 Summary:	Toolkit to interact with virtualization capabilities
 Summary(pl.UTF-8):	Narzędzia współpracujące z funkcjami wirtualizacji
 Name:		libvirt
-Version:	1.2.17
-Release:	2
+Version:	5.5.0
+Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
-Source0:	ftp://ftp.libvirt.org/libvirt/%{name}-%{version}.tar.gz
-# Source0-md5:	a1f49050223be3cbd7678c32b1ee2756
-Source1:	%{name}.init
+Source0:	http://libvirt.org/sources/libvirt-%{version}.tar.xz
+# Source0-md5:	27c5fb6c8d2d46eb9e8165aeb3b499b0
+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}-lxc.patch
-Patch2:		%{name}-qemu-acl.patch
-Patch3:		%{name}-xend.patch
-Patch4:		virtlockd.init.patch
-Patch5:		%{name}-udevadm-settle.patch
-Patch6:		vserver.patch
-Patch7:		bashisms.patch
-Patch8:		%{name}-guests.init.patch
+Patch1:		%{name}-qemu-acl.patch
+Patch2:		%{name}-udevadm-settle.patch
+Patch3:		bashisms.patch
+Patch4:		%{name}-sysctl-dir.patch
 URL:		http://www.libvirt.org/
+BuildRequires:	acl-devel
+BuildRequires:	attr-devel
 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:	dbus-devel >= 1.0.0
 BuildRequires:	device-mapper-devel >= 1.0.0
 BuildRequires:	gawk
+BuildRequires:	gcc >= 6:4.4
 BuildRequires:	gettext-tools >= 0.17
 %{?with_glusterfs:BuildRequires:	glusterfs-devel >= 3.4.1}
-BuildRequires:	gnutls-devel >= 1.0.25
+BuildRequires:	gnutls-devel >= 2.2.0
 BuildRequires:	libapparmor-devel
 BuildRequires:	libblkid-devel >= 2.17
 BuildRequires:	libcap-ng-devel >= 0.4.0
@@ -78,7 +85,8 @@ BuildRequires:	libfuse-devel >= 2.8.6
 BuildRequires:	libgcrypt-devel
 BuildRequires:	libnl-devel >= 3.2
 BuildRequires:	libpcap-devel >= 1.0.0
-BuildRequires:	libselinux-devel >= 2.0.82
+BuildRequires:	libselinux-devel >= 2.5
+BuildRequires:	libssh-devel >= 0.7
 BuildRequires:	libssh2-devel >= 1.3
 BuildRequires:	libtool
 %{?with_xenapi:BuildRequires:	libxenserver-devel}
@@ -87,28 +95,27 @@ BuildRequires:	libxslt-devel
 BuildRequires:	ncurses-devel
 %{?with_netcf:BuildRequires:	netcf-devel >= 0.2.0}
 BuildRequires:	numactl-devel
-BuildRequires:	openldap-devel
 %{?with_hyperv:BuildRequires:	openwsman-devel >= 2.2.3}
 BuildRequires:	parted-devel >= 1.8.0
 BuildRequires:	pkgconfig
-BuildRequires:	polkit
+%{?with_polkit:BuildRequires:	polkit}
 %{?with_polkit:BuildRequires:	polkit-devel >= 0.90}
 BuildRequires:	readline-devel
 BuildRequires:	rpmbuild(macros) >= 1.627
 %{?with_sanlock:BuildRequires:	sanlock-devel >= 0.8}
 %{?with_systemtap:BuildRequires:	systemtap-sdt-devel}
-BuildRequires:	sheepdog
-BuildRequires:	udev-devel >= 1:145
-%{?with_xen:BuildRequires:	xen-devel >= 4.2}
+BuildRequires:	udev-devel >= 1:218
+%{?with_wireshark:BuildRequires:	wireshark-devel >= 1.11.3}
+%{?with_libxl:BuildRequires:	xen-devel >= 4.4}
 # For disk driver
 BuildRequires:	xorg-lib-libpciaccess-devel >= 0.10.0
-BuildRequires:	yajl-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:	libselinux >= 2.0.82
+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}
@@ -116,8 +123,10 @@ Obsoletes:	libvirt-daemon-esx
 Obsoletes:	libvirt-daemon-hyperv
 Obsoletes:	libvirt-daemon-openvz
 Obsoletes:	libvirt-daemon-phyp
+Obsoletes:	libvirt-daemon-uml
 Obsoletes:	libvirt-daemon-vbox
 Obsoletes:	libvirt-daemon-vmware
+Obsoletes:	libvirt-daemon-xen
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -147,6 +156,17 @@ wirtualizacji.
 
 Ten pakiet zawiera podstawowe biblioteki oraz plik konfiguracyjny.
 
+%package -n bash-completion-%{name}
+Summary:        bash-completion for libvirt
+Group:          Applications/Shells
+Requires:       bash-completion
+%if "%{_rpmversion}" >= "5"
+BuildArch:      noarch
+%endif
+
+%description -n bash-completion-%{name}
+This package provides bash-completion for libvirt.
+
 %package devel
 Summary:	Development files for programs using libvirt
 Summary(pl.UTF-8):	Pliki programistyczne do programów wykorzystujących libvirt
@@ -156,18 +176,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 >= 1.0.25
+Requires:	gnutls-devel >= 2.2.0
 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:	libselinux-devel >= 2.0.82
+Requires:	libselinux-devel >= 2.5
 Requires:	libxml2-devel >= 1:2.6.0
 Requires:	numactl-devel
 %{?with_hyperv:Requires:	openwsman-devel >= 2.2.3}
-%{?with_xen:Requires:	xen-devel >= 4.2}
-Requires:	yajl-devel
 
 %description devel
 Libvirt is a C toolkit to interact with the virtualization
@@ -225,11 +243,10 @@ Requires:	iproute2
 Requires:	libblkid >= 2.17
 %{?with_netcf:Requires:	netcf >= 0.2.0}
 Requires:	parted-libs >= 1.8.0
+Requires:	rc-scripts
 # Needed for probing the power management features of the host.
 Requires:	pm-utils
-Requires:	rc-scripts
-Requires:	sheepdog
-Requires:	udev-libs >= 1:145
+Requires:	udev-libs >= 1:218
 Requires:	util-linux
 Requires:	virtual(module-tools)
 Requires:	xorg-lib-libpciaccess >= 0.10.0
@@ -252,6 +269,7 @@ Suggests:	parted >= 1.8.0
 Suggests:	polkit >= 0.93
 #Suggests:	radvd
 Suggests:	scrub
+#Suggests:	sheepdog
 Provides:	libvirt(hypervisor)
 
 %description daemon
@@ -264,13 +282,39 @@ Demon działający po stronie serwera wymagany do zarządzania funkcjami
 wirtualizacji nowych wersji Linuksa. Wymaga podpakietu specyficznego
 dla hipernadzorcy.
 
+%package daemon-storage-gluster
+Summary:	Storage driver plugin for GlusterFS
+Summary(pl.UTF-8):	Wtyczka składowania danych wykorzystująca GlusterFS
+Group:		Libraries
+Requires:	%{name}-daemon = %{version}-%{release}
+Requires:	glusterfs-libs >= 3.4.1
+
+%description daemon-storage-gluster
+Storage driver plugin for GlusterFS.
+
+%description daemon-storage-gluster -l pl.UTF-8
+Wtyczka składowania danych wykorzystująca system plików GlusterFS.
+
+%package daemon-storage-rbd
+Summary:	Storage driver plugin for Ceph RADOS Block Device
+Summary(pl.UTF-8):	Wtyczka składowania danych wykorzystująca urządzenie blokowe RADOS (Ceph)
+Group:		Libraries
+Requires:	%{name}-daemon = %{version}-%{release}
+
+%description daemon-storage-rbd
+Storage driver plugin for Ceph RADOS Block Device.
+
+%description daemon-storage-rbd -l pl.UTF-8
+Wtyczka składowania danych wykorzystująca urządzenie blokowe RADOS
+(system plików Ceph).
+
 %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
+Requires:	xen >= 4.4
 Provides:	libvirt(hypervisor)
 
 %description daemon-libxl
@@ -318,46 +362,13 @@ 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
-Group:		Libraries
-Requires:	%{name}-daemon = %{version}-%{release}
-Provides:	libvirt(hypervisor)
-
-%description daemon-uml
-Server side driver required to manage the virtualization capabilities
-of UML.
-
-%description daemon-uml -l pl.UTF-8
-Sterownik wymagany po stronie serwera do zarządzania funkcjami
-wirtualizacji UML.
-
-%package daemon-xen
-Summary:	Server side driver required to run XEN guests
-Summary(pl.UTF-8):	Sterownik wymagany po stronie serwera do uruchamiania gości XEN
-Group:		Libraries
-Requires:	%{name}-daemon = %{version}-%{release}
-Requires:	/usr/sbin/qcow-create
-Requires:	xen
-Requires:	xen-xend
-Provides:	libvirt(hypervisor)
-
-%description daemon-xen
-Server side driver required to manage the virtualization capabilities
-of XEN.
-
-%description daemon-xen -l pl.UTF-8
-Sterownik wymagany po stronie serwera do zarządzania funkcjami
-wirtualizacji XEN.
-
 %package client
 Summary:	Client side utilities of the libvirt library
 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 >= 1.0.25
+Requires:	gnutls >= 2.2.0
 Requires:	netcat-openbsd
 Requires:	rc-scripts
 Requires(post,preun):	/sbin/chkconfig
@@ -379,8 +390,6 @@ Requires:	%{name}-daemon = %{version}-%{release}
 %{?with_libxl:Requires:	%{name}-daemon-libxl = %{version}-%{release}}
 Requires:	%{name}-daemon-lxc = %{version}-%{release}
 Requires:	%{name}-daemon-qemu = %{version}-%{release}
-Requires:	%{name}-daemon-uml = %{version}-%{release}
-Requires:	%{name}-daemon-xen = %{version}-%{release}
 
 %description utils
 Libvirt is a C toolkit to interact with the virtualization
@@ -408,18 +417,25 @@ systemtap/dtrace probes for libvirt.
 %description -n systemtap-libvirt -l pl.UTF-8
 Sondy systemtap/dtrace dla libvirt.
 
+%package -n wireshark-libvirt
+Summary:	Wireshark dissector module for libvirt packets
+Summary(pl.UTF-8):	Moduł sekcji Wiresharka do pakietów libvirt
+Group:		Libraries
+Requires:	wireshark >= 1.11.3
+
+%description -n wireshark-libvirt
+Wireshark dissector module for libvirt packets.
+
+%description -n wireshark-libvirt -l pl.UTF-8
+Moduł sekcji Wiresharka do pakietów libvirt.
+
 %prep
 %setup -q
 %patch0 -p1
-# TODO
-#patch1 -p1
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%{?with_vserver:%patch6 -p1}
-%patch7 -p1
-%patch8 -p1
 
 %build
 %{__libtoolize}
@@ -460,12 +476,15 @@ Sondy systemtap/dtrace dla libvirt.
 	SCRUB=/usr/bin/scrub \
 	OVSVSCTL=/usr/bin/ovs-vsctl \
 	NUMAD=/usr/bin/numad \
-	COLLIE=/usr/sbin/collie \
+	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 \
@@ -503,13 +522,11 @@ Sondy systemtap/dtrace dla libvirt.
 	--with-sasl \
 	--with-selinux \
 	--with-udev \
-	%{__with_without uml} \
 	%{__with_without vbox vbox %{_libdir}/VirtualBox} \
 	--with-virtualport \
 	%{__with_without vmware} \
-	%{__with_without xen} \
+	%{!?with_wireshark:--without-wireshark-dissector} \
 	%{__with_without xenapi} \
-	--with-yajl \
 	--x-libraries=%{_libdir}
 
 %{__make} \
@@ -517,22 +534,39 @@ Sondy systemtap/dtrace dla libvirt.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d}
+install -d $RPM_BUILD_ROOT/etc/{sysconfig,sysctl.d,rc.d/init.d}
 
 %{__make} install \
 	DEVHELP_DIR=%{_gtkdocdir}/%{name}/devhelp \
 	DESTDIR=$RPM_BUILD_ROOT
 
 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
+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} $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/*/epan/libvirt.la \
+	%{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/epan/libvirt.a} \
+%endif
+
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/locale/{bal,ilo,kw@kkcor,kw@uccor,kw_GB,tw,wba}
 
 %find_lang %{name}
 
@@ -545,11 +579,19 @@ rm -rf $RPM_BUILD_ROOT
 %post daemon
 /sbin/chkconfig --add libvirtd
 %service libvirtd restart
+/sbin/chkconfig --add virtlockd
+%service virtlockd restart
+/sbin/chkconfig --add virtlogd
+%service virtlogd restart
 
 %preun daemon
 if [ "$1" = "0" ]; then
 	%service -q libvirtd stop
 	/sbin/chkconfig --del libvirtd
+	%service -q virtlockd stop
+	/sbin/chkconfig --del virtlockd
+	%service -q virtlogd stop
+	/sbin/chkconfig --del virtlogd
 fi
 
 %post client
@@ -565,7 +607,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc ChangeLog README TODO NEWS
+%doc AUTHORS ChangeLog NEWS README.md
 %dir %{_sysconfdir}/libvirt
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libvirt.conf
 %attr(755,root,root) %{_libdir}/libvirt.so.*.*.*
@@ -579,9 +621,18 @@ fi
 %attr(755,root,root) %{_libdir}/libvirt-qemu.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libvirt-qemu.so.0
 
+# NSS modules
+%attr(755,root,root) %{_libdir}/libnss_libvirt.so.2
+%attr(755,root,root) %{_libdir}/libnss_libvirt_guest.so.2
+
 %dir %{_libdir}/libvirt
 %dir %{_datadir}/libvirt
-%{_datadir}/libvirt/libvirtLogo.png
+
+%files -n bash-completion-%{name}
+%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)
@@ -593,8 +644,11 @@ fi
 %{_gtkdocdir}/%{name}
 %{_includedir}/%{name}
 %{_pkgconfigdir}/libvirt.pc
+%{_pkgconfigdir}/libvirt-admin.pc
 %{?with_lxc:%{_pkgconfigdir}/libvirt-lxc.pc}
 %{_pkgconfigdir}/libvirt-qemu.pc
+%{_mandir}/man7/virkeycode-*.7*
+%{_mandir}/man7/virkeyname-*.7*
 
 %files static
 %defattr(644,root,root,755)
@@ -607,10 +661,12 @@ fi
 %files lock-sanlock
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/virt-sanlock-cleanup
-%attr(755,root,root) %{_libdir}/libvirt_sanlock_helper
+%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
@@ -624,27 +680,34 @@ fi
 %dir %attr(700,root,root) %{_sysconfdir}/libvirt/qemu/networks/autostart
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libvirtd.conf
 %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,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
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sasl/libvirt.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/libvirtd
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/virtlockd
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/virtlogd
 %attr(754,root,root) /etc/rc.d/init.d/libvirtd
 %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/logrotate.d/libvirtd
-%attr(755,root,root) %{_libdir}/libvirt_iohelper
-%attr(755,root,root) %{_libdir}/libvirt_parthelper
-%attr(755,root,root) %{_libdir}/virt-aa-helper
+%attr(755,root,root) %{_libexecdir}/libvirt_iohelper
+%attr(755,root,root) %{_libexecdir}/libvirt_parthelper
+%attr(755,root,root) %{_libexecdir}/virt-aa-helper
 %attr(755,root,root) %{_sbindir}/libvirtd
 %attr(755,root,root) %{_sbindir}/virtlockd
+%attr(755,root,root) %{_sbindir}/virtlogd
 %{_datadir}/augeas/lenses/libvirtd.aug
 %{_datadir}/augeas/lenses/libvirt_lockd.aug
 %{_datadir}/augeas/lenses/virtlockd.aug
+%{_datadir}/augeas/lenses/virtlogd.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
 %if %{with polkit}
 %{_datadir}/polkit-1/actions/org.libvirt.api.policy
 %{_datadir}/polkit-1/actions/org.libvirt.unix.policy
@@ -652,6 +715,7 @@ fi
 %endif
 %{_mandir}/man8/libvirtd.8*
 %{_mandir}/man8/virtlockd.8*
+%{_mandir}/man8/virtlogd.8*
 %dir /var/lib/libvirt
 %dir /var/lib/libvirt/dnsmasq
 %attr(711,root,root) %dir /var/lib/libvirt/boot
@@ -664,16 +728,41 @@ 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
-%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_vbox.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_logical.so
+# mpath requires libdevmapper, but libvirt itself requires it too
+%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_mpath.so
+%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_scsi.so
+%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_sheepdog.so
+%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_zfs.so
+%dir %{_libdir}/libvirt/storage-file
+%attr(755,root,root) %{_libdir}/libvirt/storage-file/libvirt_storage_file_fs.so
+
+%if %{with glusterfs}
+%files daemon-storage-gluster
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_gluster.so
+%attr(755,root,root) %{_libdir}/libvirt/storage-file/libvirt_storage_file_gluster.so
+%endif
+
+%if %{with ceph}
+%files daemon-storage-rbd
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_rbd.so
+%endif
 
 %if %{with libxl}
 %files daemon-libxl
@@ -700,7 +789,7 @@ fi
 %attr(700,root,root) %dir /var/log/libvirt/lxc
 %{_datadir}/augeas/lenses/libvirtd_lxc.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug
-%attr(755,root,root) %{_libdir}/libvirt_lxc
+%attr(755,root,root) %{_libexecdir}/libvirt_lxc
 %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_lxc.so
 %endif
 
@@ -720,34 +809,20 @@ fi
 %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_qemu.so
 %endif
 
-%if %{with uml}
-%files daemon-uml
-%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
-%endif
-
-%if %{with xen}
-%files daemon-xen
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_xen.so
-%endif
-
 %files client
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/libvirt-guests
 %attr(754,root,root) /etc/rc.d/init.d/libvirt-guests
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virt-login-shell.conf
 %attr(755,root,root) %{_bindir}/virsh
+%attr(755,root,root) %{_bindir}/virt-admin
 %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-validate
 %attr(754,root,root) %{_libexecdir}/libvirt-guests.sh
 %{_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*
@@ -755,6 +830,7 @@ fi
 %dir %{_datadir}/libvirt/schemas
 %{_datadir}/libvirt/schemas/basictypes.rng
 %{_datadir}/libvirt/schemas/capability.rng
+%{_datadir}/libvirt/schemas/cputypes.rng
 %{_datadir}/libvirt/schemas/domain.rng
 %{_datadir}/libvirt/schemas/domaincaps.rng
 %{_datadir}/libvirt/schemas/domaincommon.rng
@@ -762,12 +838,18 @@ fi
 %{_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
+%{_datadir}/libvirt/schemas/nwfilterbinding.rng
 %{_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
 
 %files utils
 %defattr(644,root,root,755)
@@ -777,5 +859,11 @@ fi
 %defattr(644,root,root,755)
 %{_datadir}/systemtap/tapset/libvirt_functions.stp
 %{_datadir}/systemtap/tapset/libvirt_probes.stp
-%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp
+%{?with_qemu:%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp}
+%endif
+
+%if %{with wireshark}
+%files -n wireshark-libvirt
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/wireshark/plugins/*/epan/libvirt.so
 %endif