From 1b882146a35d63fa4a6ae44a2737d20c243fad02 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 27 Nov 2023 14:38:49 +0000 Subject: [PATCH] Fix build for libxml2 2.12.1 --- 0001-common-Update-submodule.patch | 28 ++++++++++++++++++++++++++++ virt-v2v.spec | 7 ++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 0001-common-Update-submodule.patch diff --git a/0001-common-Update-submodule.patch b/0001-common-Update-submodule.patch new file mode 100644 index 0000000..4a2c17e --- /dev/null +++ b/0001-common-Update-submodule.patch @@ -0,0 +1,28 @@ +From ef769cb91b54a6d4f1309518d7048b2c46559cc8 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Mon, 27 Nov 2023 14:08:01 +0000 +Subject: [PATCH] common: Update submodule + +Pick up this commit required by libxml2 2.12.1: + + mlxml: Include for xmlReadMemory +--- + common | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Submodule common e711121607..6185aa8431: +diff --git a/common/mlxml/xml-c.c b/common/mlxml/xml-c.c +index 715c3bb..e024bd8 100644 +--- a/common/mlxml/xml-c.c ++++ b/common/mlxml/xml-c.c +@@ -34,6 +34,7 @@ + #include + #include + ++#include + #include + #include + #include +-- +2.42.0 + diff --git a/virt-v2v.spec b/virt-v2v.spec index 57bae9a..c1680c9 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -15,7 +15,7 @@ Name: virt-v2v Epoch: 1 Version: 2.3.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -48,6 +48,8 @@ ExcludeArch: %{ix86} ExclusiveArch: x86_64 %endif +Patch: 0001-common-Update-submodule.patch + %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif @@ -308,6 +310,9 @@ done %changelog +* Mon Nov 27 2023 Richard W.M. Jones - 1:2.3.6-2 +- Fix build for libxml2 2.12.1 + * Thu Nov 02 2023 Richard W.M. Jones - 1:2.3.6-1 - New development branch version 2.3.6