From 7440ec8d7273128335621f031de41317451989a73606db4c8dcac0a00746c2d4 Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Thu, 30 Jan 2020 22:06:17 +0000 Subject: [PATCH] - spec: Fix several rpmlint warnings OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=800 --- libvirt.changes | 5 +++++ libvirt.spec | 23 +++++++++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/libvirt.changes b/libvirt.changes index c327417..3182163 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 30 22:05:24 UTC 2020 - James Fehlig + +- spec: Fix several rpmlint warnings + ------------------------------------------------------------------- Thu Jan 30 00:45:39 UTC 2020 - James Fehlig diff --git a/libvirt.spec b/libvirt.spec index 5d90b96..4f25561 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -1,7 +1,7 @@ # # spec file for package libvirt # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -417,8 +417,7 @@ Requires: numad # libvirtd depends on 'messagebus' service Requires: dbus-1 -# libvirt is configured with paths to UEFI firmwares in %build, -# hence add a dependency to the firmware packages +# A KVM or Xen libvirt stack really does need UEFI firmware these days %ifarch x86_64 Requires: qemu-ovmf-x86_64 %endif @@ -835,7 +834,7 @@ Bash completion script stub. %package devel Summary: Libraries, includes, etc. to compile with the libvirt library Group: Development/Libraries/C and C++ -Requires: %{name}-client = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Suggests: %{name}-doc = %{version}-%{release} Requires: pkg-config @@ -1244,7 +1243,7 @@ fi %pre daemon %{_bindir}/getent group libvirt >/dev/null || %{_sbindir}/groupadd -r libvirt -%service_add_pre libvirtd.service virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket +%service_add_pre libvirtd.service libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket libvirtd-tcp.socket libvirtd-tls.socket virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket virtproxyd.service virtproxyd.socket virtproxyd-ro.socket virtproxyd-admin.socket virtproxyd-tcp.socket virtproxyd-tls.socket virt-guest-shutdown.target %post daemon /sbin/ldconfig @@ -1254,7 +1253,7 @@ fi %if %{with_firewalld} %firewalld_reload %endif -%service_add_post libvirtd.service libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket libvirtd-tcp.socket libvirtd-tls.socket virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket virtproxyd.service virtproxyd.socket virtproxyd-ro.socket virtproxyd-admin.socket virtproxyd-tcp.socket virtproxyd-tls.socket +%service_add_post libvirtd.service libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket libvirtd-tcp.socket libvirtd-tls.socket virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket virtproxyd.service virtproxyd.socket virtproxyd-ro.socket virtproxyd-admin.socket virtproxyd-tcp.socket virtproxyd-tls.socket virt-guest-shutdown.target %{fillup_only -n libvirtd} %{fillup_only -n virtlockd} %{fillup_only -n virtlogd} @@ -1268,7 +1267,7 @@ if ! grep -q -E '^\s*LIBVIRTD_ARGS=.*--timeout' %{_sysconfdir}/sysconfig/libvirt fi %preun daemon -%service_del_preun libvirtd.service libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket libvirtd-tcp.socket libvirtd-tls.socket virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket +%service_del_preun libvirtd.service libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket libvirtd-tcp.socket libvirtd-tls.socket virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket virtproxyd.service virtproxyd.socket virtproxyd-ro.socket virtproxyd-admin.socket virtproxyd-tcp.socket virtproxyd-tls.socket virt-guest-shutdown.target %postun daemon /sbin/ldconfig @@ -1279,7 +1278,7 @@ if test $1 -eq 0 ; then done /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : fi -%service_del_postun libvirtd.service virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket +%service_del_postun libvirtd.service libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket libvirtd-tcp.socket libvirtd-tls.socket virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket virtproxyd.service virtproxyd.socket virtproxyd-ro.socket virtproxyd-admin.socket virtproxyd-tcp.socket virtproxyd-tls.socket virt-guest-shutdown.target %posttrans daemon # All connection drivers should be installed post transaction. @@ -1343,17 +1342,17 @@ fi %postun daemon-driver-nwfilter %service_del_postun virtnwfilterd.service virtnwfilterd.socket virtnwfilterd-ro.socket virtnwfilterd-admin.socket -%pre daemon-driver-storage +%pre daemon-driver-storage-core %service_add_pre virtstoraged.service virtstoraged.socket virtstoraged-ro.socket virtstoraged-admin.socket -%post daemon-driver-storage +%post daemon-driver-storage-core %service_add_post virtstoraged.service virtstoraged.socket virtstoraged-ro.socket virtstoraged-admin.socket %{fillup_only -n virtstoraged} -%preun daemon-driver-storage +%preun daemon-driver-storage-core %service_del_preun virtstoraged.service virtstoraged.socket virtstoraged-ro.socket virtstoraged-admin.socket -%postun daemon-driver-storage +%postun daemon-driver-storage-core %service_del_postun virtstoraged.service virtstoraged.socket virtstoraged-ro.socket virtstoraged-admin.socket %pre daemon-driver-interface