Hello community,
here is the log from the commit of package libvirt for openSUSE:Factory checked
in at 2017-11-30 12:38:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libvirt (Old)
and /work/SRC/openSUSE:Factory/.libvirt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt"
Thu Nov 30 12:38:04 2017 rev:241 rq:545094 version:3.9.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2017-11-21
15:23:12.009156024 +0100
+++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2017-11-30
12:38:10.605657325 +0100
@@ -1,0 +2,20 @@
+Thu Nov 23 13:47:54 UTC 2017 - rbr...@suse.com
+
+- Replace references to /var/adm/fillup-templates with new
+ %_fillupdir macro (boo#1069468)
+
+-------------------------------------------------------------------
+Wed Nov 22 22:25:43 UTC 2017 - ku...@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 - o...@aepfle.de
+
+- Replace hardcoded libvirt with Name tag when refering to subpkgs
+- Remove dependencies to /bin/sh in libs and nss %post scripts
+
+-------------------------------------------------------------------
New:
----
74a13be4-xdr-flags.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libvirt.spec ++++++
--- /var/tmp/diff_new_pack.cymfs5/_old 2017-11-30 12:38:12.561586203 +0100
+++ /var/tmp/diff_new_pack.cymfs5/_new 2017-11-30 12:38:12.565586057 +0100
@@ -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
%define with_xen 0%{!?_without_xen:1}
%define with_qemu 0%{!?_without_qemu:1}
@@ -166,35 +171,35 @@
License: LGPL-2.1+
Group: Development/Libraries/C and C++
-Requires: libvirt-daemon = %{version}-%{release}
-Requires: libvirt-daemon-config-network = %{version}-%{release}
-Requires: libvirt-daemon-config-nwfilter = %{version}-%{release}
+Requires: %{name}-daemon = %{version}-%{release}
+Requires: %{name}-daemon-config-network = %{version}-%{release}
+Requires: %{name}-daemon-config-nwfilter = %{version}-%{release}
%if %{with_libxl}
-Requires: libvirt-daemon-driver-libxl = %{version}-%{release}
+Requires: %{name}-daemon-driver-libxl = %{version}-%{release}
%endif
%if %{with_lxc}
-Requires: libvirt-daemon-driver-lxc = %{version}-%{release}
+Requires: %{name}-daemon-driver-lxc = %{version}-%{release}
%endif
%if %{with_qemu}
-Requires: libvirt-daemon-driver-qemu = %{version}-%{release}
+Requires: %{name}-daemon-driver-qemu = %{version}-%{release}
%endif
%if %{with_uml}
-Requires: libvirt-daemon-driver-uml = %{version}-%{release}
+Requires: %{name}-daemon-driver-uml = %{version}-%{release}
%endif
%if %{with_xen}
-Requires: libvirt-daemon-driver-xen = %{version}-%{release}
+Requires: %{name}-daemon-driver-xen = %{version}-%{release}
%endif
%if %{with_vbox}
-Requires: libvirt-daemon-driver-vbox = %{version}-%{release}
+Requires: %{name}-daemon-driver-vbox = %{version}-%{release}
%endif
-Requires: libvirt-client = %{version}-%{release}
-Requires: libvirt-daemon-driver-interface = %{version}-%{release}
-Requires: libvirt-daemon-driver-network = %{version}-%{release}
-Requires: libvirt-daemon-driver-nodedev = %{version}-%{release}
-Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
-Requires: libvirt-daemon-driver-secret = %{version}-%{release}
-Requires: libvirt-daemon-driver-storage = %{version}-%{release}
-Requires: libvirt-libs = %{version}-%{release}
+Requires: %{name}-client = %{version}-%{release}
+Requires: %{name}-daemon-driver-interface = %{version}-%{release}
+Requires: %{name}-daemon-driver-network = %{version}-%{release}
+Requires: %{name}-daemon-driver-nodedev = %{version}-%{release}
+Requires: %{name}-daemon-driver-nwfilter = %{version}-%{release}
+Requires: %{name}-daemon-driver-secret = %{version}-%{release}
+Requires: %{name}-daemon-driver-storage = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
# All build-time requirements. Run-time requirements are
# listed against each sub-RPM
@@ -240,6 +245,9 @@
BuildRequires: libnl3-devel
BuildRequires: libpcap-devel
BuildRequires: libselinux-devel
+%if 0%{?suse_version} >= 1330
+BuildRequires: libtirpc-devel
+%endif
%if %{with_apparmor}
BuildRequires: apparmor-rpm-macros
BuildRequires: libapparmor-devel
@@ -301,6 +309,7 @@
Source100: %{name}-rpmlintrc
# Upstream patches
Patch0: 8056721c-qemu-null-storage-source.patch
+Patch1: 74a13be4-xdr-flags.patch
# Patches pending upstream review
Patch100: libxl-dom-reset.patch
Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch
@@ -398,8 +407,8 @@
Summary: Default configuration files for the libvirtd daemon
Group: Development/Libraries/C and C++
-Requires: libvirt-daemon = %{version}-%{release}
-Requires: libvirt-daemon-driver-network = %{version}-%{release}
+Requires: %{name}-daemon = %{version}-%{release}
+Requires: %{name}-daemon-driver-network = %{version}-%{release}
%description daemon-config-network
Default configuration files for setting up NAT based networking
@@ -408,8 +417,8 @@
Summary: Network filter configuration files for the libvirtd
Group: Development/Libraries/C and C++
-Requires: libvirt-daemon = %{version}-%{release}
-Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
+Requires: %{name}-daemon = %{version}-%{release}
+Requires: %{name}-daemon-driver-nwfilter = %{version}-%{release}
%description daemon-config-nwfilter
Network filter configuration files for the libvirt daemon, used for
@@ -421,7 +430,7 @@
Requires: dnsmasq >= 2.41
Requires: iptables
# TODO Requires: iptables-ipv6
-Requires: libvirt-daemon = %{version}-%{release}
+Requires: %{name}-daemon = %{version}-%{release}
Requires: radvd
%description daemon-driver-network
@@ -435,7 +444,7 @@
Requires: ebtables
Requires: iptables
# TODO Requires: iptables-ipv6
-Requires: libvirt-daemon = %{version}-%{release}
+Requires: %{name}-daemon = %{version}-%{release}
%description daemon-driver-nwfilter
The nwfilter driver plugin for the libvirtd daemon, providing
@@ -445,7 +454,7 @@
%package daemon-driver-nodedev
Summary: Nodedev driver plugin for the libvirtd daemon
Group: Development/Libraries/C and C++
-Requires: libvirt-daemon = %{version}-%{release}
+Requires: %{name}-daemon = %{version}-%{release}
%description daemon-driver-nodedev
The nodedev driver plugin for the libvirtd daemon, providing
@@ -455,7 +464,7 @@
%package daemon-driver-interface
Summary: Interface driver plugin for the libvirtd daemon
Group: Development/Libraries/C and C++
-Requires: libvirt-daemon = %{version}-%{release}
+Requires: %{name}-daemon = %{version}-%{release}
%description daemon-driver-interface
The interface driver plugin for the libvirtd daemon, providing
@@ -465,7 +474,7 @@
%package daemon-driver-secret
Summary: Secret driver plugin for the libvirtd daemon
Group: Development/Libraries/C and C++
-Requires: libvirt-daemon = %{version}-%{release}
+Requires: %{name}-daemon = %{version}-%{release}
%description daemon-driver-secret
The secret driver plugin for the libvirtd daemon, providing
@@ -474,7 +483,7 @@
%package daemon-driver-storage-core
Summary: Storage driver plugin including base backends for the libvirtd
daemon
Group: Development/Libraries/C and C++
-Requires: libvirt-daemon = %{version}-%{release}
+Requires: %{name}-daemon = %{version}-%{release}
Requires: nfs-utils
# For mkfs
Requires: util-linux
@@ -491,7 +500,7 @@
%package daemon-driver-storage-logical
Summary: Storage driver plugin for lvm volumes
Group: Development/Libraries/C and C++
-Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
+Requires: %{name}-daemon-driver-storage-core = %{version}-%{release}
Requires: lvm2
%description daemon-driver-storage-logical
@@ -501,8 +510,8 @@
%package daemon-driver-storage-disk
Summary: Storage driver plugin for disk
Group: Development/Libraries/C and C++
+Requires: %{name}-daemon-driver-storage-core = %{version}-%{release}
Requires: device-mapper
-Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
Requires: parted
%description daemon-driver-storage-disk
@@ -512,7 +521,7 @@
%package daemon-driver-storage-scsi
Summary: Storage driver plugin for local scsi devices
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
The storage driver backend adding implementation of the storage APIs for scsi
@@ -521,7 +530,7 @@
%package daemon-driver-storage-iscsi
Summary: Storage driver plugin for iscsi
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
%description daemon-driver-storage-iscsi
@@ -531,8 +540,8 @@
%package daemon-driver-storage-mpath
Summary: Storage driver plugin for multipath volumes
Group: Development/Libraries/C and C++
+Requires: %{name}-daemon-driver-storage-core = %{version}-%{release}
Requires: device-mapper
-Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
%description daemon-driver-storage-mpath
The storage driver backend adding implementation of the storage APIs for
@@ -543,7 +552,7 @@
%package daemon-driver-storage-gluster
Summary: Storage driver plugin for gluster
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
The storage driver backend adding implementation of the storage APIs for
gluster
@@ -554,7 +563,7 @@
%package daemon-driver-storage-rbd
Summary: Storage driver plugin for rbd
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
The storage driver backend adding implementation of the storage APIs for rbd
@@ -565,7 +574,7 @@
%package daemon-driver-storage-sheepdog
Summary: Storage driver plugin for sheepdog
Group: Development/Libraries/C and C++
-Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
+Requires: %{name}-daemon-driver-storage-core = %{version}-%{release}
Requires: sheepdog
%description daemon-driver-storage-sheepdog
@@ -576,20 +585,20 @@
%package daemon-driver-storage
Summary: Storage driver plugin including all backends for the libvirtd
daemon
Group: Development/Libraries/C and C++
-Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
-Requires: libvirt-daemon-driver-storage-disk = %{version}-%{release}
-Requires: libvirt-daemon-driver-storage-iscsi = %{version}-%{release}
-Requires: libvirt-daemon-driver-storage-logical = %{version}-%{release}
-Requires: libvirt-daemon-driver-storage-mpath = %{version}-%{release}
-Requires: libvirt-daemon-driver-storage-scsi = %{version}-%{release}
+Requires: %{name}-daemon-driver-storage-core = %{version}-%{release}
+Requires: %{name}-daemon-driver-storage-disk = %{version}-%{release}
+Requires: %{name}-daemon-driver-storage-iscsi = %{version}-%{release}
+Requires: %{name}-daemon-driver-storage-logical = %{version}-%{release}
+Requires: %{name}-daemon-driver-storage-mpath = %{version}-%{release}
+Requires: %{name}-daemon-driver-storage-scsi = %{version}-%{release}
%if %{with_storage_gluster}
-Requires: libvirt-daemon-driver-storage-gluster = %{version}-%{release}
+Requires: %{name}-daemon-driver-storage-gluster = %{version}-%{release}
%endif
%if %{with_storage_rbd}
-Requires: libvirt-daemon-driver-storage-rbd = %{version}-%{release}
+Requires: %{name}-daemon-driver-storage-rbd = %{version}-%{release}
%endif
%if %{with_storage_sheepdog}
-Requires: libvirt-daemon-driver-storage-sheepdog = %{version}-%{release}
+Requires: %{name}-daemon-driver-storage-sheepdog = %{version}-%{release}
%endif
%description daemon-driver-storage
@@ -602,11 +611,11 @@
%package daemon-driver-qemu
Summary: Qemu driver plugin for the libvirtd daemon
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
+Requires: %{name}-daemon-driver-network = %{version}-%{release}
+Requires: %{name}-daemon-driver-storage-core = %{version}-%{release}
Requires: /usr/bin/qemu-img
-Requires: libvirt-daemon-driver-network = %{version}-%{release}
-Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
# For image compression
Requires: bzip2
Requires: gzip
@@ -624,9 +633,9 @@
%package daemon-driver-lxc
Summary: LXC driver plugin for the libvirtd daemon
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
-Requires: libvirt-daemon-driver-network = %{version}-%{release}
+Requires: %{name}-daemon-driver-network = %{version}-%{release}
%description daemon-driver-lxc
The LXC driver plugin for the libvirtd daemon, providing
@@ -639,7 +648,7 @@
%package daemon-driver-uml
Summary: Uml driver plugin for the libvirtd daemon
Group: Development/Libraries/C and C++
-Requires: libvirt-daemon = %{version}-%{release}
+Requires: %{name}-daemon = %{version}-%{release}
%description daemon-driver-uml
The UML driver plugin for the libvirtd daemon, providing
@@ -652,7 +661,7 @@
%package daemon-driver-xen
Summary: Xen driver plugin for the libvirtd daemon
Group: Development/Libraries/C and C++
-Requires: libvirt-daemon = %{version}-%{release}
+Requires: %{name}-daemon = %{version}-%{release}
%description daemon-driver-xen
The Xen driver plugin for the libvirtd daemon, providing
@@ -664,7 +673,7 @@
%package daemon-driver-vbox
Summary: VirtualBox driver plugin for the libvirtd daemon
Group: Development/Libraries/C and C++
-Requires: libvirt-daemon = %{version}-%{release}
+Requires: %{name}-daemon = %{version}-%{release}
%description daemon-driver-vbox
The vbox driver plugin for the libvirtd daemon, providing
@@ -677,7 +686,7 @@
%package daemon-driver-libxl
Summary: Libxl driver plugin for the libvirtd daemon
Group: Development/Libraries/C and C++
-Requires: libvirt-daemon = %{version}-%{release}
+Requires: %{name}-daemon = %{version}-%{release}
%description daemon-driver-libxl
The Libxl driver plugin for the libvirtd daemon, providing
@@ -690,14 +699,14 @@
Summary: Server side daemon & driver required to run QEMU guests
Group: Development/Libraries/C and C++
-Requires: libvirt-daemon = %{version}-%{release}
-Requires: libvirt-daemon-driver-interface = %{version}-%{release}
-Requires: libvirt-daemon-driver-network = %{version}-%{release}
-Requires: libvirt-daemon-driver-nodedev = %{version}-%{release}
-Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
-Requires: libvirt-daemon-driver-qemu = %{version}-%{release}
-Requires: libvirt-daemon-driver-secret = %{version}-%{release}
-Requires: libvirt-daemon-driver-storage = %{version}-%{release}
+Requires: %{name}-daemon = %{version}-%{release}
+Requires: %{name}-daemon-driver-interface = %{version}-%{release}
+Requires: %{name}-daemon-driver-network = %{version}-%{release}
+Requires: %{name}-daemon-driver-nodedev = %{version}-%{release}
+Requires: %{name}-daemon-driver-nwfilter = %{version}-%{release}
+Requires: %{name}-daemon-driver-qemu = %{version}-%{release}
+Requires: %{name}-daemon-driver-secret = %{version}-%{release}
+Requires: %{name}-daemon-driver-storage = %{version}-%{release}
%description daemon-qemu
Server side daemon and driver required to manage the virtualization
@@ -710,14 +719,14 @@
Summary: Server side daemon & driver required to run LXC guests
Group: Development/Libraries/C and C++
-Requires: libvirt-daemon = %{version}-%{release}
-Requires: libvirt-daemon-driver-interface = %{version}-%{release}
-Requires: libvirt-daemon-driver-lxc = %{version}-%{release}
-Requires: libvirt-daemon-driver-network = %{version}-%{release}
-Requires: libvirt-daemon-driver-nodedev = %{version}-%{release}
-Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
-Requires: libvirt-daemon-driver-secret = %{version}-%{release}
-Requires: libvirt-daemon-driver-storage = %{version}-%{release}
+Requires: %{name}-daemon = %{version}-%{release}
+Requires: %{name}-daemon-driver-interface = %{version}-%{release}
+Requires: %{name}-daemon-driver-lxc = %{version}-%{release}
+Requires: %{name}-daemon-driver-network = %{version}-%{release}
+Requires: %{name}-daemon-driver-nodedev = %{version}-%{release}
+Requires: %{name}-daemon-driver-nwfilter = %{version}-%{release}
+Requires: %{name}-daemon-driver-secret = %{version}-%{release}
+Requires: %{name}-daemon-driver-storage = %{version}-%{release}
%description daemon-lxc
Server side daemon and driver required to manage the virtualization
@@ -730,14 +739,14 @@
Summary: Server side daemon & driver required to run UML guests
Group: Development/Libraries/C and C++
-Requires: libvirt-daemon = %{version}-%{release}
-Requires: libvirt-daemon-driver-interface = %{version}-%{release}
-Requires: libvirt-daemon-driver-network = %{version}-%{release}
-Requires: libvirt-daemon-driver-nodedev = %{version}-%{release}
-Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
-Requires: libvirt-daemon-driver-secret = %{version}-%{release}
-Requires: libvirt-daemon-driver-storage = %{version}-%{release}
-Requires: libvirt-daemon-driver-uml = %{version}-%{release}
+Requires: %{name}-daemon = %{version}-%{release}
+Requires: %{name}-daemon-driver-interface = %{version}-%{release}
+Requires: %{name}-daemon-driver-network = %{version}-%{release}
+Requires: %{name}-daemon-driver-nodedev = %{version}-%{release}
+Requires: %{name}-daemon-driver-nwfilter = %{version}-%{release}
+Requires: %{name}-daemon-driver-secret = %{version}-%{release}
+Requires: %{name}-daemon-driver-storage = %{version}-%{release}
+Requires: %{name}-daemon-driver-uml = %{version}-%{release}
%description daemon-uml
Server side daemon and driver required to manage the virtualization
@@ -750,19 +759,19 @@
Summary: Server side daemon & driver required to run XEN guests
Group: Development/Libraries/C and C++
-Requires: libvirt-daemon = %{version}-%{release}
+Requires: %{name}-daemon = %{version}-%{release}
%if %{with_xen}
-Requires: libvirt-daemon-driver-xen = %{version}-%{release}
+Requires: %{name}-daemon-driver-xen = %{version}-%{release}
%endif
%if %{with_libxl}
-Requires: libvirt-daemon-driver-libxl = %{version}-%{release}
+Requires: %{name}-daemon-driver-libxl = %{version}-%{release}
%endif
-Requires: libvirt-daemon-driver-interface = %{version}-%{release}
-Requires: libvirt-daemon-driver-network = %{version}-%{release}
-Requires: libvirt-daemon-driver-nodedev = %{version}-%{release}
-Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
-Requires: libvirt-daemon-driver-secret = %{version}-%{release}
-Requires: libvirt-daemon-driver-storage = %{version}-%{release}
+Requires: %{name}-daemon-driver-interface = %{version}-%{release}
+Requires: %{name}-daemon-driver-network = %{version}-%{release}
+Requires: %{name}-daemon-driver-nodedev = %{version}-%{release}
+Requires: %{name}-daemon-driver-nwfilter = %{version}-%{release}
+Requires: %{name}-daemon-driver-secret = %{version}-%{release}
+Requires: %{name}-daemon-driver-storage = %{version}-%{release}
Requires: xen
%description daemon-xen
@@ -775,14 +784,14 @@
%package daemon-vbox
Summary: Server side daemon & driver required to run VirtualBox guests
Group: Development/Libraries/C and C++
-Requires: libvirt-daemon = %{version}-%{release}
-Requires: libvirt-daemon-driver-interface = %{version}-%{release}
-Requires: libvirt-daemon-driver-network = %{version}-%{release}
-Requires: libvirt-daemon-driver-nodedev = %{version}-%{release}
-Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
-Requires: libvirt-daemon-driver-secret = %{version}-%{release}
-Requires: libvirt-daemon-driver-storage = %{version}-%{release}
-Requires: libvirt-daemon-driver-vbox = %{version}-%{release}
+Requires: %{name}-daemon = %{version}-%{release}
+Requires: %{name}-daemon-driver-interface = %{version}-%{release}
+Requires: %{name}-daemon-driver-network = %{version}-%{release}
+Requires: %{name}-daemon-driver-nodedev = %{version}-%{release}
+Requires: %{name}-daemon-driver-nwfilter = %{version}-%{release}
+Requires: %{name}-daemon-driver-secret = %{version}-%{release}
+Requires: %{name}-daemon-driver-storage = %{version}-%{release}
+Requires: %{name}-daemon-driver-vbox = %{version}-%{release}
# Specify supported virtualbox API explicitly. See ./src/vbox
# Reference bsc#1017189
Requires: virtualbox < 5.2
@@ -871,7 +880,7 @@
%package nss
Summary: Libvirt plugin for Name Service Switch
Group: Development/Libraries/C and C++
-Requires: libvirt-daemon-driver-network = %{version}-%{release}
+Requires: %{name}-daemon-driver-network = %{version}-%{release}
%description nss
libvirt plugin for NSS for translating domain names into IP addresses.
@@ -879,6 +888,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%patch100 -p1
%patch101 -p1
%patch102 -p1
@@ -1194,12 +1204,12 @@
%endif
# init scripts
-mkdir -p %{buildroot}/%{_localstatedir}/adm/fillup-templates
+mkdir -p %{buildroot}/%{_fillupdir}
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/virtlogd
%{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.virtlogd
-mv %{buildroot}/%{_sysconfdir}/sysconfig/virtlockd
%{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.virtlockd
-mv %{buildroot}/%{_sysconfdir}/sysconfig/libvirt-guests
%{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.libvirt-guests
+mv %{buildroot}/%{_sysconfdir}/sysconfig/libvirtd
%{buildroot}%{_fillupdir}/sysconfig.libvirtd
+mv %{buildroot}/%{_sysconfdir}/sysconfig/virtlogd
%{buildroot}/%{_fillupdir}/sysconfig.virtlogd
+mv %{buildroot}/%{_sysconfdir}/sysconfig/virtlockd
%{buildroot}/%{_fillupdir}/sysconfig.virtlockd
+mv %{buildroot}/%{_sysconfdir}/sysconfig/libvirt-guests
%{buildroot}/%{_fillupdir}/sysconfig.libvirt-guests
# Provide rc symlink backward compatibility
ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rclibvirtd
ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtlogd
@@ -1290,7 +1300,7 @@
# sockets, if libvirtd is already enabled and start them if
# libvirtd is running, otherwise you'll get failures to start
# guests
-%triggerpostun daemon -- libvirt-daemon < 1.3.0
+%triggerpostun daemon -- %{name}-daemon < 1.3.0
if [ $1 -ge 1 ] ; then
/usr/bin/systemctl is-enabled libvirtd.service 1>/dev/null 2>&1 &&
/usr/bin/systemctl enable virtlogd.socket || :
@@ -1323,17 +1333,13 @@
%postun client
%service_del_postun libvirt-guests.service
-%post libs
-/sbin/ldconfig
+%post libs -p /sbin/ldconfig
-%postun libs
-/sbin/ldconfig
+%postun libs -p /sbin/ldconfig
-%post nss
-/sbin/ldconfig
+%post nss -p /sbin/ldconfig
-%postun nss
-/sbin/ldconfig
+%postun nss -p /sbin/ldconfig
%files
%doc %{_docdir}/%{name}/libvirt.README
@@ -1345,9 +1351,9 @@
%dir %{_libdir}/%{name}
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/hooks
-%{_localstatedir}/adm/fillup-templates/sysconfig.libvirtd
-%{_localstatedir}/adm/fillup-templates/sysconfig.virtlogd
-%{_localstatedir}/adm/fillup-templates/sysconfig.virtlockd
+%{_fillupdir}/sysconfig.libvirtd
+%{_fillupdir}/sysconfig.virtlogd
+%{_fillupdir}/sysconfig.virtlockd
%{_unitdir}/libvirtd.service
%{_unitdir}/virt-guest-shutdown.target
%{_unitdir}/virtlogd.service
@@ -1596,7 +1602,7 @@
%{_bindir}/virt-host-validate
%dir %{_libdir}/%{name}
%attr(0755, root, root) %{_libdir}/%{name}/libvirt-guests.sh
-%{_localstatedir}/adm/fillup-templates/sysconfig.libvirt-guests
+%{_fillupdir}/sysconfig.libvirt-guests
%{_unitdir}/libvirt-guests.service
%{_sbindir}/rclibvirt-guests
++++++ 74a13be4-xdr-flags.patch ++++++
commit 74a13be4a4562affcf721ba32f42f8a27ec3557d
Author: Martin Kletzander <mklet...@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 <mklet...@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 = \
