From a3df6bd816cd581dc806cf44f6d5644ba84a09382b4c8fb065e3881bb19cab50 Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Tue, 27 Sep 2022 22:39:17 +0000 Subject: [PATCH] - spec: Only drop redefinition of libexecdir on Factory and newer bsc#1203775 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=947 --- libvirt.changes | 6 ++++++ libvirt.spec | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/libvirt.changes b/libvirt.changes index e98c4dd..caaf23f 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 27 22:36:37 UTC 2022 - James Fehlig + +- spec: Only drop redefinition of libexecdir on Factory and newer + bsc#1203775 + ------------------------------------------------------------------- Thu Sep 15 12:16:26 UTC 2022 - Stefan Schubert diff --git a/libvirt.spec b/libvirt.spec index a526356..1e72eb1 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -972,7 +972,14 @@ libvirt plugin for NSS for translating domain names into IP addresses. %define libvirt_logrotate_posttrans() %nil %endif +# The libvirt package has long redefined libexecdir. Stop the madness at SLE15. +# Factory and newer will use the product default for libexecdir +%if 0%{?suse_version} <= 1500 + %define _libexecdir %{_libdir}/%{name} +%endif + %meson \ + --libexecdir=%{_libexecdir} \ -Drunstatedir=%{_rundir} \ %{?arg_qemu} \ %{?arg_openvz} \