pool/libvirt
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 545094 from Virtualization

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/545094
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvirt?expand=0&rev=241
This commit is contained in:
Dominique Leuenberger 2017-11-30 11:38:04 +00:00 committed by Git OBS Bridge
commit 9185fa47ec
3 changed files with 195 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
74a13be4-xdr-flags.patch Normal file
View File

@ -0,0 +1,56 @@
commit 74a13be4a4562affcf721ba32f42f8a27ec3557d
Author: Martin Kletzander <mkletzan@redhat.com>
Date: Thu Nov 16 14:24:45 2017 +0100
build: Use XDR_CFLAGS in more places
Since update to glibc-2.26 removed the /usr/include/rpc/rpc.h we used until now,
it showed us a problem with not using XDR_CFLAGS properly. On linux that
variable has usually -I/usr/include/tirpc because we already probe for it
properly, we just don't use it everywhere we need. It is needed by wireshark
dissector as well as testutilsqemu.c (through includes) so the build fails with:
wireshark/src/packet-libvirt.c:33:10: fatal error: rpc/xdr.h: No such file or directory
#include <rpc/xdr.h>
^~~~~~~~~~~
and
In file included from ../src/logging/log_manager.h:29:0,
from ../src/qemu/qemu_domain.h:40,
from testutilsqemu.c:11:
../src/logging/log_protocol.h:9:10: fatal error: rpc/rpc.h: No such file or directory
#include <rpc/rpc.h>
^~~~~~~~~~~
Since lot of tests use testutilsqemu.c it is easier to add XDR_CFLAGS to
AM_CFLAGS than adding it to all $binary_CFLAGS. It's just for tests and we
already have bunch of CFLAGS there anyway.
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
Index: libvirt-3.9.0/tests/Makefile.am
===================================================================
--- libvirt-3.9.0.orig/tests/Makefile.am
+++ libvirt-3.9.0/tests/Makefile.am
@@ -48,6 +48,7 @@ AM_CFLAGS = \
$(APPARMOR_CFLAGS) \
$(YAJL_CFLAGS) \
$(COVERAGE_CFLAGS) \
+ $(XDR_CFLAGS) \
$(WARN_CFLAGS)
AM_LDFLAGS = \
Index: libvirt-3.9.0/tools/Makefile.am
===================================================================
--- libvirt-3.9.0.orig/tools/Makefile.am
+++ libvirt-3.9.0/tools/Makefile.am
@@ -428,7 +428,7 @@ if WITH_WIRESHARK_DISSECTOR
ws_plugin_LTLIBRARIES = wireshark/src/libvirt.la
wireshark_src_libvirt_la_CPPFLAGS = \
- -I wireshark/src $(WIRESHARK_DISSECTOR_CFLAGS)
+ -I wireshark/src $(WIRESHARK_DISSECTOR_CFLAGS) $(XDR_CFLAGS)
wireshark_src_libvirt_la_LDFLAGS = -avoid-version -module
nodist_wireshark_src_libvirt_la_SOURCES = wireshark/src/plugin.c
wireshark_src_libvirt_la_SOURCES = \

20
libvirt.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Thu Nov 23 13:47:54 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
-------------------------------------------------------------------
Wed Nov 22 22:25:43 UTC 2017 - kukuk@suse.de
- spec: Add BuildRequires for libtirpc-devel in preparation of
removal of sunrpc from glibc
- build: Use XDR_CFLAGS in more places
74a13be4-xdr-flags.patch
-------------------------------------------------------------------
Wed Nov 22 19:05:39 UTC 2017 - olaf@aepfle.de
- Replace hardcoded libvirt with Name tag when refering to subpkgs
- Remove dependencies to /bin/sh in libs and nss %post scripts
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 17 21:59:28 UTC 2017 - jfehlig@suse.com Fri Nov 17 21:59:28 UTC 2017 - jfehlig@suse.com

232
libvirt.spec
View File

@ -16,6 +16,11 @@
# #
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%endif
# The hypervisor drivers that run in libvirtd # The hypervisor drivers that run in libvirtd
%define with_xen 0%{!?_without_xen:1} %define with_xen 0%{!?_without_xen:1}
%define with_qemu 0%{!?_without_qemu:1} %define with_qemu 0%{!?_without_qemu:1}
@ -166,35 +171,35 @@ Summary: Library providing a simple virtualization API
License: LGPL-2.1+ License: LGPL-2.1+
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libvirt-daemon = %{version}-%{release} Requires: %{name}-daemon = %{version}-%{release}
Requires: libvirt-daemon-config-network = %{version}-%{release} Requires: %{name}-daemon-config-network = %{version}-%{release}
Requires: libvirt-daemon-config-nwfilter = %{version}-%{release} Requires: %{name}-daemon-config-nwfilter = %{version}-%{release}
%if %{with_libxl} %if %{with_libxl}
Requires: libvirt-daemon-driver-libxl = %{version}-%{release} Requires: %{name}-daemon-driver-libxl = %{version}-%{release}
%endif %endif
%if %{with_lxc} %if %{with_lxc}
Requires: libvirt-daemon-driver-lxc = %{version}-%{release} Requires: %{name}-daemon-driver-lxc = %{version}-%{release}
%endif %endif
%if %{with_qemu} %if %{with_qemu}
Requires: libvirt-daemon-driver-qemu = %{version}-%{release} Requires: %{name}-daemon-driver-qemu = %{version}-%{release}
%endif %endif
%if %{with_uml} %if %{with_uml}
Requires: libvirt-daemon-driver-uml = %{version}-%{release} Requires: %{name}-daemon-driver-uml = %{version}-%{release}
%endif %endif
%if %{with_xen} %if %{with_xen}
Requires: libvirt-daemon-driver-xen = %{version}-%{release} Requires: %{name}-daemon-driver-xen = %{version}-%{release}
%endif %endif
%if %{with_vbox} %if %{with_vbox}
Requires: libvirt-daemon-driver-vbox = %{version}-%{release} Requires: %{name}-daemon-driver-vbox = %{version}-%{release}
%endif %endif
Requires: libvirt-client = %{version}-%{release} Requires: %{name}-client = %{version}-%{release}
Requires: libvirt-daemon-driver-interface = %{version}-%{release} Requires: %{name}-daemon-driver-interface = %{version}-%{release}
Requires: libvirt-daemon-driver-network = %{version}-%{release} Requires: %{name}-daemon-driver-network = %{version}-%{release}
Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} Requires: %{name}-daemon-driver-nodedev = %{version}-%{release}
Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} Requires: %{name}-daemon-driver-nwfilter = %{version}-%{release}
Requires: libvirt-daemon-driver-secret = %{version}-%{release} Requires: %{name}-daemon-driver-secret = %{version}-%{release}
Requires: libvirt-daemon-driver-storage = %{version}-%{release} Requires: %{name}-daemon-driver-storage = %{version}-%{release}
Requires: libvirt-libs = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release}
# All build-time requirements. Run-time requirements are # All build-time requirements. Run-time requirements are
# listed against each sub-RPM # listed against each sub-RPM
@ -240,6 +245,9 @@ BuildRequires: libavahi-devel
BuildRequires: libnl3-devel BuildRequires: libnl3-devel
BuildRequires: libpcap-devel BuildRequires: libpcap-devel
BuildRequires: libselinux-devel BuildRequires: libselinux-devel
%if 0%{?suse_version} >= 1330
BuildRequires: libtirpc-devel
%endif
%if %{with_apparmor} %if %{with_apparmor}
BuildRequires: apparmor-rpm-macros BuildRequires: apparmor-rpm-macros
BuildRequires: libapparmor-devel BuildRequires: libapparmor-devel
@ -301,6 +309,7 @@ Source99: baselibs.conf
Source100: %{name}-rpmlintrc Source100: %{name}-rpmlintrc
# Upstream patches # Upstream patches
Patch0: 8056721c-qemu-null-storage-source.patch Patch0: 8056721c-qemu-null-storage-source.patch
Patch1: 74a13be4-xdr-flags.patch
# Patches pending upstream review # Patches pending upstream review
Patch100: libxl-dom-reset.patch Patch100: libxl-dom-reset.patch
Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch
@ -398,8 +407,8 @@ for specific drivers.
Summary: Default configuration files for the libvirtd daemon Summary: Default configuration files for the libvirtd daemon
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libvirt-daemon = %{version}-%{release} Requires: %{name}-daemon = %{version}-%{release}
Requires: libvirt-daemon-driver-network = %{version}-%{release} Requires: %{name}-daemon-driver-network = %{version}-%{release}
%description daemon-config-network %description daemon-config-network
Default configuration files for setting up NAT based networking Default configuration files for setting up NAT based networking
@ -408,8 +417,8 @@ Default configuration files for setting up NAT based networking
Summary: Network filter configuration files for the libvirtd Summary: Network filter configuration files for the libvirtd
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libvirt-daemon = %{version}-%{release} Requires: %{name}-daemon = %{version}-%{release}
Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} Requires: %{name}-daemon-driver-nwfilter = %{version}-%{release}
%description daemon-config-nwfilter %description daemon-config-nwfilter
Network filter configuration files for the libvirt daemon, used for Network filter configuration files for the libvirt daemon, used for
@ -421,7 +430,7 @@ Group: Development/Libraries/C and C++
Requires: dnsmasq >= 2.41 Requires: dnsmasq >= 2.41
Requires: iptables Requires: iptables
# TODO Requires: iptables-ipv6 # TODO Requires: iptables-ipv6
Requires: libvirt-daemon = %{version}-%{release} Requires: %{name}-daemon = %{version}-%{release}
Requires: radvd Requires: radvd
%description daemon-driver-network %description daemon-driver-network
@ -435,7 +444,7 @@ Group: Development/Libraries/C and C++
Requires: ebtables Requires: ebtables
Requires: iptables Requires: iptables
# TODO Requires: iptables-ipv6 # TODO Requires: iptables-ipv6
Requires: libvirt-daemon = %{version}-%{release} Requires: %{name}-daemon = %{version}-%{release}
%description daemon-driver-nwfilter %description daemon-driver-nwfilter
The nwfilter driver plugin for the libvirtd daemon, providing The nwfilter driver plugin for the libvirtd daemon, providing
@ -445,7 +454,7 @@ iptables and ip6tables capabilities
%package daemon-driver-nodedev %package daemon-driver-nodedev
Summary: Nodedev driver plugin for the libvirtd daemon Summary: Nodedev driver plugin for the libvirtd daemon
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libvirt-daemon = %{version}-%{release} Requires: %{name}-daemon = %{version}-%{release}
%description daemon-driver-nodedev %description daemon-driver-nodedev
The nodedev driver plugin for the libvirtd daemon, providing The nodedev driver plugin for the libvirtd daemon, providing
@ -455,7 +464,7 @@ capabilities.
%package daemon-driver-interface %package daemon-driver-interface
Summary: Interface driver plugin for the libvirtd daemon Summary: Interface driver plugin for the libvirtd daemon
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libvirt-daemon = %{version}-%{release} Requires: %{name}-daemon = %{version}-%{release}
%description daemon-driver-interface %description daemon-driver-interface
The interface driver plugin for the libvirtd daemon, providing The interface driver plugin for the libvirtd daemon, providing
@ -465,7 +474,7 @@ netcontrol library
%package daemon-driver-secret %package daemon-driver-secret
Summary: Secret driver plugin for the libvirtd daemon Summary: Secret driver plugin for the libvirtd daemon
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libvirt-daemon = %{version}-%{release} Requires: %{name}-daemon = %{version}-%{release}
%description daemon-driver-secret %description daemon-driver-secret
The secret driver plugin for the libvirtd daemon, providing The secret driver plugin for the libvirtd daemon, providing
@ -474,7 +483,7 @@ an implementation of the secret key APIs.
%package daemon-driver-storage-core %package daemon-driver-storage-core
Summary: Storage driver plugin including base backends for the libvirtd daemon Summary: Storage driver plugin including base backends for the libvirtd daemon
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libvirt-daemon = %{version}-%{release} Requires: %{name}-daemon = %{version}-%{release}
Requires: nfs-utils Requires: nfs-utils
# For mkfs # For mkfs
Requires: util-linux Requires: util-linux
@ -491,7 +500,7 @@ iSCSI, and multipath storage.
%package daemon-driver-storage-logical %package daemon-driver-storage-logical
Summary: Storage driver plugin for lvm volumes Summary: Storage driver plugin for lvm volumes
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} Requires: %{name}-daemon-driver-storage-core = %{version}-%{release}
Requires: lvm2 Requires: lvm2
%description daemon-driver-storage-logical %description daemon-driver-storage-logical
@ -501,8 +510,8 @@ volumes using lvm.
%package daemon-driver-storage-disk %package daemon-driver-storage-disk
Summary: Storage driver plugin for disk Summary: Storage driver plugin for disk
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %{name}-daemon-driver-storage-core = %{version}-%{release}
Requires: device-mapper Requires: device-mapper
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
Requires: parted Requires: parted
%description daemon-driver-storage-disk %description daemon-driver-storage-disk
@ -512,7 +521,7 @@ volumes using the host disks.
%package daemon-driver-storage-scsi %package daemon-driver-storage-scsi
Summary: Storage driver plugin for local scsi devices Summary: Storage driver plugin for local scsi devices
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} Requires: %{name}-daemon-driver-storage-core = %{version}-%{release}
%description daemon-driver-storage-scsi %description daemon-driver-storage-scsi
The storage driver backend adding implementation of the storage APIs for scsi The storage driver backend adding implementation of the storage APIs for scsi
@ -521,7 +530,7 @@ host devices.
%package daemon-driver-storage-iscsi %package daemon-driver-storage-iscsi
Summary: Storage driver plugin for iscsi Summary: Storage driver plugin for iscsi
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} Requires: %{name}-daemon-driver-storage-core = %{version}-%{release}
Requires: open-iscsi Requires: open-iscsi
%description daemon-driver-storage-iscsi %description daemon-driver-storage-iscsi
@ -531,8 +540,8 @@ volumes using the host iscsi stack.
%package daemon-driver-storage-mpath %package daemon-driver-storage-mpath
Summary: Storage driver plugin for multipath volumes Summary: Storage driver plugin for multipath volumes
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %{name}-daemon-driver-storage-core = %{version}-%{release}
Requires: device-mapper Requires: device-mapper
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
%description daemon-driver-storage-mpath %description daemon-driver-storage-mpath
The storage driver backend adding implementation of the storage APIs for The storage driver backend adding implementation of the storage APIs for
@ -543,7 +552,7 @@ multipath storage using device mapper.
%package daemon-driver-storage-gluster %package daemon-driver-storage-gluster
Summary: Storage driver plugin for gluster Summary: Storage driver plugin for gluster
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} Requires: %{name}-daemon-driver-storage-core = %{version}-%{release}
%description daemon-driver-storage-gluster %description daemon-driver-storage-gluster
The storage driver backend adding implementation of the storage APIs for gluster The storage driver backend adding implementation of the storage APIs for gluster
@ -554,7 +563,7 @@ volumes using libgfapi.
%package daemon-driver-storage-rbd %package daemon-driver-storage-rbd
Summary: Storage driver plugin for rbd Summary: Storage driver plugin for rbd
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} Requires: %{name}-daemon-driver-storage-core = %{version}-%{release}
%description daemon-driver-storage-rbd %description daemon-driver-storage-rbd
The storage driver backend adding implementation of the storage APIs for rbd The storage driver backend adding implementation of the storage APIs for rbd
@ -565,7 +574,7 @@ volumes using the ceph protocol.
%package daemon-driver-storage-sheepdog %package daemon-driver-storage-sheepdog
Summary: Storage driver plugin for sheepdog Summary: Storage driver plugin for sheepdog
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} Requires: %{name}-daemon-driver-storage-core = %{version}-%{release}
Requires: sheepdog Requires: sheepdog
%description daemon-driver-storage-sheepdog %description daemon-driver-storage-sheepdog
@ -576,20 +585,20 @@ sheepdog volumes using.
%package daemon-driver-storage %package daemon-driver-storage
Summary: Storage driver plugin including all backends for the libvirtd daemon Summary: Storage driver plugin including all backends for the libvirtd daemon
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} Requires: %{name}-daemon-driver-storage-core = %{version}-%{release}
Requires: libvirt-daemon-driver-storage-disk = %{version}-%{release} Requires: %{name}-daemon-driver-storage-disk = %{version}-%{release}
Requires: libvirt-daemon-driver-storage-iscsi = %{version}-%{release} Requires: %{name}-daemon-driver-storage-iscsi = %{version}-%{release}
Requires: libvirt-daemon-driver-storage-logical = %{version}-%{release} Requires: %{name}-daemon-driver-storage-logical = %{version}-%{release}
Requires: libvirt-daemon-driver-storage-mpath = %{version}-%{release} Requires: %{name}-daemon-driver-storage-mpath = %{version}-%{release}
Requires: libvirt-daemon-driver-storage-scsi = %{version}-%{release} Requires: %{name}-daemon-driver-storage-scsi = %{version}-%{release}
%if %{with_storage_gluster} %if %{with_storage_gluster}
Requires: libvirt-daemon-driver-storage-gluster = %{version}-%{release} Requires: %{name}-daemon-driver-storage-gluster = %{version}-%{release}
%endif %endif
%if %{with_storage_rbd} %if %{with_storage_rbd}
Requires: libvirt-daemon-driver-storage-rbd = %{version}-%{release} Requires: %{name}-daemon-driver-storage-rbd = %{version}-%{release}
%endif %endif
%if %{with_storage_sheepdog} %if %{with_storage_sheepdog}
Requires: libvirt-daemon-driver-storage-sheepdog = %{version}-%{release} Requires: %{name}-daemon-driver-storage-sheepdog = %{version}-%{release}
%endif %endif
%description daemon-driver-storage %description daemon-driver-storage
@ -602,11 +611,11 @@ parted and more.
%package daemon-driver-qemu %package daemon-driver-qemu
Summary: Qemu driver plugin for the libvirtd daemon Summary: Qemu driver plugin for the libvirtd daemon
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libvirt-daemon = %{version}-%{release} Requires: %{name}-daemon = %{version}-%{release}
# There really is a hard cross-driver dependency here # There really is a hard cross-driver dependency here
Requires: %{name}-daemon-driver-network = %{version}-%{release}
Requires: %{name}-daemon-driver-storage-core = %{version}-%{release}
Requires: /usr/bin/qemu-img Requires: /usr/bin/qemu-img
Requires: libvirt-daemon-driver-network = %{version}-%{release}
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
# For image compression # For image compression
Requires: bzip2 Requires: bzip2
Requires: gzip Requires: gzip
@ -624,9 +633,9 @@ an implementation of the hypervisor driver APIs using QEMU.
%package daemon-driver-lxc %package daemon-driver-lxc
Summary: LXC driver plugin for the libvirtd daemon Summary: LXC driver plugin for the libvirtd daemon
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libvirt-daemon = %{version}-%{release} Requires: %{name}-daemon = %{version}-%{release}
# There really is a hard cross-driver dependency here # There really is a hard cross-driver dependency here
Requires: libvirt-daemon-driver-network = %{version}-%{release} Requires: %{name}-daemon-driver-network = %{version}-%{release}
%description daemon-driver-lxc %description daemon-driver-lxc
The LXC driver plugin for the libvirtd daemon, providing The LXC driver plugin for the libvirtd daemon, providing
@ -639,7 +648,7 @@ the Linux kernel
%package daemon-driver-uml %package daemon-driver-uml
Summary: Uml driver plugin for the libvirtd daemon Summary: Uml driver plugin for the libvirtd daemon
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libvirt-daemon = %{version}-%{release} Requires: %{name}-daemon = %{version}-%{release}
%description daemon-driver-uml %description daemon-driver-uml
The UML driver plugin for the libvirtd daemon, providing The UML driver plugin for the libvirtd daemon, providing
@ -652,7 +661,7 @@ User Mode Linux
%package daemon-driver-xen %package daemon-driver-xen
Summary: Xen driver plugin for the libvirtd daemon Summary: Xen driver plugin for the libvirtd daemon
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libvirt-daemon = %{version}-%{release} Requires: %{name}-daemon = %{version}-%{release}
%description daemon-driver-xen %description daemon-driver-xen
The Xen driver plugin for the libvirtd daemon, providing The Xen driver plugin for the libvirtd daemon, providing
@ -664,7 +673,7 @@ an implementation of the hypervisor driver APIs using Xen.
%package daemon-driver-vbox %package daemon-driver-vbox
Summary: VirtualBox driver plugin for the libvirtd daemon Summary: VirtualBox driver plugin for the libvirtd daemon
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libvirt-daemon = %{version}-%{release} Requires: %{name}-daemon = %{version}-%{release}
%description daemon-driver-vbox %description daemon-driver-vbox
The vbox driver plugin for the libvirtd daemon, providing The vbox driver plugin for the libvirtd daemon, providing
@ -677,7 +686,7 @@ VirtualBox
%package daemon-driver-libxl %package daemon-driver-libxl
Summary: Libxl driver plugin for the libvirtd daemon Summary: Libxl driver plugin for the libvirtd daemon
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libvirt-daemon = %{version}-%{release} Requires: %{name}-daemon = %{version}-%{release}
%description daemon-driver-libxl %description daemon-driver-libxl
The Libxl driver plugin for the libvirtd daemon, providing The Libxl driver plugin for the libvirtd daemon, providing
@ -690,14 +699,14 @@ an implementation of the hypervisor driver APIs using libxl.
Summary: Server side daemon & driver required to run QEMU guests Summary: Server side daemon & driver required to run QEMU guests
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libvirt-daemon = %{version}-%{release} Requires: %{name}-daemon = %{version}-%{release}
Requires: libvirt-daemon-driver-interface = %{version}-%{release} Requires: %{name}-daemon-driver-interface = %{version}-%{release}
Requires: libvirt-daemon-driver-network = %{version}-%{release} Requires: %{name}-daemon-driver-network = %{version}-%{release}
Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} Requires: %{name}-daemon-driver-nodedev = %{version}-%{release}
Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} Requires: %{name}-daemon-driver-nwfilter = %{version}-%{release}
Requires: libvirt-daemon-driver-qemu = %{version}-%{release} Requires: %{name}-daemon-driver-qemu = %{version}-%{release}
Requires: libvirt-daemon-driver-secret = %{version}-%{release} Requires: %{name}-daemon-driver-secret = %{version}-%{release}
Requires: libvirt-daemon-driver-storage = %{version}-%{release} Requires: %{name}-daemon-driver-storage = %{version}-%{release}
%description daemon-qemu %description daemon-qemu
Server side daemon and driver required to manage the virtualization Server side daemon and driver required to manage the virtualization
@ -710,14 +719,14 @@ capabilities of the QEMU emulators
Summary: Server side daemon & driver required to run LXC guests Summary: Server side daemon & driver required to run LXC guests
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libvirt-daemon = %{version}-%{release} Requires: %{name}-daemon = %{version}-%{release}
Requires: libvirt-daemon-driver-interface = %{version}-%{release} Requires: %{name}-daemon-driver-interface = %{version}-%{release}
Requires: libvirt-daemon-driver-lxc = %{version}-%{release} Requires: %{name}-daemon-driver-lxc = %{version}-%{release}
Requires: libvirt-daemon-driver-network = %{version}-%{release} Requires: %{name}-daemon-driver-network = %{version}-%{release}
Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} Requires: %{name}-daemon-driver-nodedev = %{version}-%{release}
Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} Requires: %{name}-daemon-driver-nwfilter = %{version}-%{release}
Requires: libvirt-daemon-driver-secret = %{version}-%{release} Requires: %{name}-daemon-driver-secret = %{version}-%{release}
Requires: libvirt-daemon-driver-storage = %{version}-%{release} Requires: %{name}-daemon-driver-storage = %{version}-%{release}
%description daemon-lxc %description daemon-lxc
Server side daemon and driver required to manage the virtualization Server side daemon and driver required to manage the virtualization
@ -730,14 +739,14 @@ capabilities of LXC
Summary: Server side daemon & driver required to run UML guests Summary: Server side daemon & driver required to run UML guests
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libvirt-daemon = %{version}-%{release} Requires: %{name}-daemon = %{version}-%{release}
Requires: libvirt-daemon-driver-interface = %{version}-%{release} Requires: %{name}-daemon-driver-interface = %{version}-%{release}
Requires: libvirt-daemon-driver-network = %{version}-%{release} Requires: %{name}-daemon-driver-network = %{version}-%{release}
Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} Requires: %{name}-daemon-driver-nodedev = %{version}-%{release}
Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} Requires: %{name}-daemon-driver-nwfilter = %{version}-%{release}
Requires: libvirt-daemon-driver-secret = %{version}-%{release} Requires: %{name}-daemon-driver-secret = %{version}-%{release}
Requires: libvirt-daemon-driver-storage = %{version}-%{release} Requires: %{name}-daemon-driver-storage = %{version}-%{release}
Requires: libvirt-daemon-driver-uml = %{version}-%{release} Requires: %{name}-daemon-driver-uml = %{version}-%{release}
%description daemon-uml %description daemon-uml
Server side daemon and driver required to manage the virtualization Server side daemon and driver required to manage the virtualization
@ -750,19 +759,19 @@ capabilities of UML
Summary: Server side daemon & driver required to run XEN guests Summary: Server side daemon & driver required to run XEN guests
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libvirt-daemon = %{version}-%{release} Requires: %{name}-daemon = %{version}-%{release}
%if %{with_xen} %if %{with_xen}
Requires: libvirt-daemon-driver-xen = %{version}-%{release} Requires: %{name}-daemon-driver-xen = %{version}-%{release}
%endif %endif
%if %{with_libxl} %if %{with_libxl}
Requires: libvirt-daemon-driver-libxl = %{version}-%{release} Requires: %{name}-daemon-driver-libxl = %{version}-%{release}
%endif %endif
Requires: libvirt-daemon-driver-interface = %{version}-%{release} Requires: %{name}-daemon-driver-interface = %{version}-%{release}
Requires: libvirt-daemon-driver-network = %{version}-%{release} Requires: %{name}-daemon-driver-network = %{version}-%{release}
Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} Requires: %{name}-daemon-driver-nodedev = %{version}-%{release}
Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} Requires: %{name}-daemon-driver-nwfilter = %{version}-%{release}
Requires: libvirt-daemon-driver-secret = %{version}-%{release} Requires: %{name}-daemon-driver-secret = %{version}-%{release}
Requires: libvirt-daemon-driver-storage = %{version}-%{release} Requires: %{name}-daemon-driver-storage = %{version}-%{release}
Requires: xen Requires: xen
%description daemon-xen %description daemon-xen
@ -775,14 +784,14 @@ capabilities of XEN
%package daemon-vbox %package daemon-vbox
Summary: Server side daemon & driver required to run VirtualBox guests Summary: Server side daemon & driver required to run VirtualBox guests
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libvirt-daemon = %{version}-%{release} Requires: %{name}-daemon = %{version}-%{release}
Requires: libvirt-daemon-driver-interface = %{version}-%{release} Requires: %{name}-daemon-driver-interface = %{version}-%{release}
Requires: libvirt-daemon-driver-network = %{version}-%{release} Requires: %{name}-daemon-driver-network = %{version}-%{release}
Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} Requires: %{name}-daemon-driver-nodedev = %{version}-%{release}
Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} Requires: %{name}-daemon-driver-nwfilter = %{version}-%{release}
Requires: libvirt-daemon-driver-secret = %{version}-%{release} Requires: %{name}-daemon-driver-secret = %{version}-%{release}
Requires: libvirt-daemon-driver-storage = %{version}-%{release} Requires: %{name}-daemon-driver-storage = %{version}-%{release}
Requires: libvirt-daemon-driver-vbox = %{version}-%{release} Requires: %{name}-daemon-driver-vbox = %{version}-%{release}
# Specify supported virtualbox API explicitly. See ./src/vbox # Specify supported virtualbox API explicitly. See ./src/vbox
# Reference bsc#1017189 # Reference bsc#1017189
Requires: virtualbox < 5.2 Requires: virtualbox < 5.2
@ -871,7 +880,7 @@ Wireshark dissector plugin for better analysis of libvirt RPC traffic.
%package nss %package nss
Summary: Libvirt plugin for Name Service Switch Summary: Libvirt plugin for Name Service Switch
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libvirt-daemon-driver-network = %{version}-%{release} Requires: %{name}-daemon-driver-network = %{version}-%{release}
%description nss %description nss
libvirt plugin for NSS for translating domain names into IP addresses. libvirt plugin for NSS for translating domain names into IP addresses.
@ -879,6 +888,7 @@ libvirt plugin for NSS for translating domain names into IP addresses.
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1
%patch100 -p1 %patch100 -p1
%patch101 -p1 %patch101 -p1
%patch102 -p1 %patch102 -p1
@ -1194,12 +1204,12 @@ rm -f %{buildroot}/%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
%endif %endif
# init scripts # init scripts
mkdir -p %{buildroot}/%{_localstatedir}/adm/fillup-templates mkdir -p %{buildroot}/%{_fillupdir}
rm -f %{buildroot}/usr/lib/sysctl.d/60-libvirtd.conf rm -f %{buildroot}/usr/lib/sysctl.d/60-libvirtd.conf
mv %{buildroot}/%{_sysconfdir}/sysconfig/libvirtd %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.libvirtd mv %{buildroot}/%{_sysconfdir}/sysconfig/libvirtd %{buildroot}%{_fillupdir}/sysconfig.libvirtd
mv %{buildroot}/%{_sysconfdir}/sysconfig/virtlogd %{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.virtlogd mv %{buildroot}/%{_sysconfdir}/sysconfig/virtlogd %{buildroot}/%{_fillupdir}/sysconfig.virtlogd
mv %{buildroot}/%{_sysconfdir}/sysconfig/virtlockd %{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.virtlockd mv %{buildroot}/%{_sysconfdir}/sysconfig/virtlockd %{buildroot}/%{_fillupdir}/sysconfig.virtlockd
mv %{buildroot}/%{_sysconfdir}/sysconfig/libvirt-guests %{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.libvirt-guests mv %{buildroot}/%{_sysconfdir}/sysconfig/libvirt-guests %{buildroot}/%{_fillupdir}/sysconfig.libvirt-guests
# Provide rc symlink backward compatibility # Provide rc symlink backward compatibility
ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rclibvirtd ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rclibvirtd
ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtlogd ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtlogd
@ -1290,7 +1300,7 @@ fi
# sockets, if libvirtd is already enabled and start them if # sockets, if libvirtd is already enabled and start them if
# libvirtd is running, otherwise you'll get failures to start # libvirtd is running, otherwise you'll get failures to start
# guests # guests
%triggerpostun daemon -- libvirt-daemon < 1.3.0 %triggerpostun daemon -- %{name}-daemon < 1.3.0
if [ $1 -ge 1 ] ; then if [ $1 -ge 1 ] ; then
/usr/bin/systemctl is-enabled libvirtd.service 1>/dev/null 2>&1 && /usr/bin/systemctl is-enabled libvirtd.service 1>/dev/null 2>&1 &&
/usr/bin/systemctl enable virtlogd.socket || : /usr/bin/systemctl enable virtlogd.socket || :
@ -1323,17 +1333,13 @@ fi
%postun client %postun client
%service_del_postun libvirt-guests.service %service_del_postun libvirt-guests.service
%post libs %post libs -p /sbin/ldconfig
/sbin/ldconfig
%postun libs %postun libs -p /sbin/ldconfig
/sbin/ldconfig
%post nss %post nss -p /sbin/ldconfig
/sbin/ldconfig
%postun nss %postun nss -p /sbin/ldconfig
/sbin/ldconfig
%files %files
%doc %{_docdir}/%{name}/libvirt.README %doc %{_docdir}/%{name}/libvirt.README
@ -1345,9 +1351,9 @@ fi
%dir %{_libdir}/%{name} %dir %{_libdir}/%{name}
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/hooks %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/hooks
%{_localstatedir}/adm/fillup-templates/sysconfig.libvirtd %{_fillupdir}/sysconfig.libvirtd
%{_localstatedir}/adm/fillup-templates/sysconfig.virtlogd %{_fillupdir}/sysconfig.virtlogd
%{_localstatedir}/adm/fillup-templates/sysconfig.virtlockd %{_fillupdir}/sysconfig.virtlockd
%{_unitdir}/libvirtd.service %{_unitdir}/libvirtd.service
%{_unitdir}/virt-guest-shutdown.target %{_unitdir}/virt-guest-shutdown.target
%{_unitdir}/virtlogd.service %{_unitdir}/virtlogd.service
@ -1596,7 +1602,7 @@ fi
%{_bindir}/virt-host-validate %{_bindir}/virt-host-validate
%dir %{_libdir}/%{name} %dir %{_libdir}/%{name}
%attr(0755, root, root) %{_libdir}/%{name}/libvirt-guests.sh %attr(0755, root, root) %{_libdir}/%{name}/libvirt-guests.sh
%{_localstatedir}/adm/fillup-templates/sysconfig.libvirt-guests %{_fillupdir}/sysconfig.libvirt-guests
%{_unitdir}/libvirt-guests.service %{_unitdir}/libvirt-guests.service
%{_sbindir}/rclibvirt-guests %{_sbindir}/rclibvirt-guests