From b90a82406e3a53ac5a7bd86fd3689574f8bbf1c299575ec7fcc16827f7c5b60f Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Tue, 18 May 2021 15:43:00 +0000 Subject: [PATCH] A few tweaks before Factory submission OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=889 --- ...mocking.patch => ee890f25-libxl-mock-funcs.patch | 13 +++++++------ libvirt.changes | 2 +- libvirt.spec | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) rename libxl-add-mocking.patch => ee890f25-libxl-mock-funcs.patch (81%) diff --git a/libxl-add-mocking.patch b/ee890f25-libxl-mock-funcs.patch similarity index 81% rename from libxl-add-mocking.patch rename to ee890f25-libxl-mock-funcs.patch index bfd80a1..3b7ff98 100644 --- a/libxl-add-mocking.patch +++ b/ee890f25-libxl-mock-funcs.patch @@ -1,4 +1,4 @@ -commit 898598bfc8605a889a1389535597eca22943390f +commit ee890f25c703a07e69f6e19f08b2a8d06ed2fc5f Author: Jim Fehlig Date: Mon May 17 11:52:25 2021 -0600 @@ -14,11 +14,12 @@ Date: Mon May 17 11:52:25 2021 -0600 https://github.com/xen-project/xen/commit/90c9f9f4ddd55e11be0506bff10c6237507c6e0d Signed-off-by: Jim Fehlig + Reviewed-by: Michal Privoznik -Index: libvirt-7.3.0/tests/libxlmock.c -=================================================================== ---- libvirt-7.3.0.orig/tests/libxlmock.c -+++ libvirt-7.3.0/tests/libxlmock.c +diff --git a/tests/libxlmock.c b/tests/libxlmock.c +index 604dc4bfbe..a52d4bc2ed 100644 +--- a/tests/libxlmock.c ++++ b/tests/libxlmock.c @@ -39,6 +39,14 @@ VIR_MOCK_IMPL_RET_VOID(xs_daemon_open, return (void*)0x1; } @@ -34,7 +35,7 @@ Index: libvirt-7.3.0/tests/libxlmock.c VIR_MOCK_IMPL_RET_ARGS(xc_interface_open, xc_interface *, xentoollog_logger *, logger, -@@ -94,6 +102,9 @@ VIR_MOCK_STUB_RET_ARGS(xc_sharing_used_f +@@ -94,6 +102,9 @@ VIR_MOCK_STUB_RET_ARGS(xc_sharing_used_frames, VIR_MOCK_STUB_VOID_ARGS(xs_daemon_close, struct xs_handle *, handle) diff --git a/libvirt.changes b/libvirt.changes index f17e971..648c5e6 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -10,7 +10,7 @@ Mon May 3 22:14:22 UTC 2021 - James Fehlig - Dropped patches: suse-bump-xen-version.patch - Added patches: - libxl-add-mocking.patch + ee890f25-libxl-mock-funcs.patch ------------------------------------------------------------------- Thu Apr 1 23:42:46 UTC 2021 - James Fehlig diff --git a/libvirt.spec b/libvirt.spec index 0041482..a67a6ea 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -290,10 +290,10 @@ Source6: libvirtd-relocation-server.xml Source99: baselibs.conf Source100: %{name}-rpmlintrc # Upstream patches +Patch0: ee890f25-libxl-mock-funcs.patch # Patches pending upstream review Patch100: libxl-dom-reset.patch Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch -Patch102: libxl-add-mocking.patch # Need to go upstream Patch150: libvirt-power8-models.patch Patch151: ppc64le-canonical-name.patch @@ -384,7 +384,7 @@ Requires: apparmor-abstractions # Ensure smooth upgrades Obsoletes: libvirt-admin < 7.3.0 -Provides: libvirt-admin +Provides: libvirt-admin = %{version} Obsoletes: libvirt-bash-completion < 7.3.0 %description daemon