From 9bb0bf8e28c8deab03258d3bea257ec670b82d8a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 24 Mar 2021 18:34:27 +0000 Subject: [PATCH] Add perl(Locale::TextDomain) dependency for virt-win-reg. Fix ounit2 dependency upstream. --- ...dfiles-Fix-bogus-directories-in-this-file.patch | 2 +- ...-t-try-to-install-.3-and-.5-files-which-d.patch | 2 +- ...emove-dependency-on-gobject-introspection.patch | 2 +- ...-build-Remove-dependency-on-perl-Sys-Virt.patch | 2 +- ...-rid-of-etc-xdg-and-XDG_CONFIG_DIRS-nonse.patch | 2 +- .../0006-builder-Use-correct-ounit2-module.patch | 64 ++++++++++++++++++++++ guestfs-tools/guestfs-tools.spec | 8 ++- 7 files changed, 76 insertions(+), 6 deletions(-) create mode 100644 guestfs-tools/0006-builder-Use-correct-ounit2-module.patch diff --git a/guestfs-tools/0001-po-docs-podfiles-Fix-bogus-directories-in-this-file.patch b/guestfs-tools/0001-po-docs-podfiles-Fix-bogus-directories-in-this-file.patch index 1fbb9d9..bb550b1 100644 --- a/guestfs-tools/0001-po-docs-podfiles-Fix-bogus-directories-in-this-file.patch +++ b/guestfs-tools/0001-po-docs-podfiles-Fix-bogus-directories-in-this-file.patch @@ -1,7 +1,7 @@ From 3bcb261f69dab9121a30aa452ef5bb6001c2f58e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 23 Mar 2021 14:09:44 +0000 -Subject: [PATCH 1/5] po-docs/podfiles: Fix bogus directories in this file. +Subject: [PATCH 1/6] po-docs/podfiles: Fix bogus directories in this file. These were caused by a partial dist directory having been created, and then "make podfiles" being run at the wrong moment. diff --git a/guestfs-tools/0002-po-docs-Don-t-try-to-install-.3-and-.5-files-which-d.patch b/guestfs-tools/0002-po-docs-Don-t-try-to-install-.3-and-.5-files-which-d.patch index 5934c40..eb3da00 100644 --- a/guestfs-tools/0002-po-docs-Don-t-try-to-install-.3-and-.5-files-which-d.patch +++ b/guestfs-tools/0002-po-docs-Don-t-try-to-install-.3-and-.5-files-which-d.patch @@ -1,7 +1,7 @@ From cba4cc0f5148fae6a8ba34c03559b9328749cbf1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 23 Mar 2021 12:19:01 +0000 -Subject: [PATCH 2/5] po-docs: Don't try to install *.3 and *.5 files which +Subject: [PATCH 2/6] po-docs: Don't try to install *.3 and *.5 files which don't exist. Fixes: commit 4354a3126152a2748cc9097cba139b3908ccc342 diff --git a/guestfs-tools/0003-build-Remove-dependency-on-gobject-introspection.patch b/guestfs-tools/0003-build-Remove-dependency-on-gobject-introspection.patch index 13f7373..6aec678 100644 --- a/guestfs-tools/0003-build-Remove-dependency-on-gobject-introspection.patch +++ b/guestfs-tools/0003-build-Remove-dependency-on-gobject-introspection.patch @@ -1,7 +1,7 @@ From 6bfe41474937bbaabd7c953ac62dc9a28aa6fa30 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 23 Mar 2021 13:38:56 +0000 -Subject: [PATCH 3/5] build: Remove dependency on gobject-introspection. +Subject: [PATCH 3/6] build: Remove dependency on gobject-introspection. Only required for libguestfs GObject bindings, not for these tools. diff --git a/guestfs-tools/0004-build-Remove-dependency-on-perl-Sys-Virt.patch b/guestfs-tools/0004-build-Remove-dependency-on-perl-Sys-Virt.patch index b845c4d..86a6b20 100644 --- a/guestfs-tools/0004-build-Remove-dependency-on-perl-Sys-Virt.patch +++ b/guestfs-tools/0004-build-Remove-dependency-on-perl-Sys-Virt.patch @@ -1,7 +1,7 @@ From 47efe06984ae1e0ba914ebcf9306d348a5ecd366 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 23 Mar 2021 13:52:19 +0000 -Subject: [PATCH 4/5] build: Remove dependency on perl Sys::Virt. +Subject: [PATCH 4/6] build: Remove dependency on perl Sys::Virt. In libguestfs this used to be required to run tests against local guests, but it's not needed in either libguestfs or guestfs-tools any diff --git a/guestfs-tools/0005-builder-Get-rid-of-etc-xdg-and-XDG_CONFIG_DIRS-nonse.patch b/guestfs-tools/0005-builder-Get-rid-of-etc-xdg-and-XDG_CONFIG_DIRS-nonse.patch index ab82999..333c7d6 100644 --- a/guestfs-tools/0005-builder-Get-rid-of-etc-xdg-and-XDG_CONFIG_DIRS-nonse.patch +++ b/guestfs-tools/0005-builder-Get-rid-of-etc-xdg-and-XDG_CONFIG_DIRS-nonse.patch @@ -1,7 +1,7 @@ From f66af6b6ddfefcbd6ecd6f4d47e0fa4ca231b125 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 23 Mar 2021 14:06:12 +0000 -Subject: [PATCH 5/5] builder: Get rid of /etc/xdg and XDG_CONFIG_DIRS +Subject: [PATCH 5/6] builder: Get rid of /etc/xdg and XDG_CONFIG_DIRS nonsense. Put the configuration in /etc/virt-builder as god intended. diff --git a/guestfs-tools/0006-builder-Use-correct-ounit2-module.patch b/guestfs-tools/0006-builder-Use-correct-ounit2-module.patch new file mode 100644 index 0000000..b5d1846 --- /dev/null +++ b/guestfs-tools/0006-builder-Use-correct-ounit2-module.patch @@ -0,0 +1,64 @@ +From b470270d44e8dc37a2417c1157eefdd9c3d65dd1 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Wed, 24 Mar 2021 18:30:45 +0000 +Subject: [PATCH 6/6] builder: Use correct ounit2 module. + +Fixes: commit 4354a3126152a2748cc9097cba139b3908ccc342 +--- + builder/Makefile.am | 2 +- + m4/guestfs-ocaml.m4 | 10 +++++----- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/builder/Makefile.am b/builder/Makefile.am +index 4d2e07843c..f49a3b0aaa 100644 +--- a/builder/Makefile.am ++++ b/builder/Makefile.am +@@ -192,7 +192,7 @@ if HAVE_OCAML_PKG_GETTEXT + OCAMLPACKAGES += -package gettext-stub + endif + if HAVE_OCAML_PKG_OUNIT +-OCAMLPACKAGES_TESTS += -package oUnit ++OCAMLPACKAGES_TESTS += -package ounit2 + endif + + OCAMLCLIBS = \ +diff --git a/m4/guestfs-ocaml.m4 b/m4/guestfs-ocaml.m4 +index a2f6cada9f..f5ac7eff29 100644 +--- a/m4/guestfs-ocaml.m4 ++++ b/m4/guestfs-ocaml.m4 +@@ -105,7 +105,7 @@ if test "x$OCAML_PKG_guestfs" = "xno"; then + fi + + OCAML_PKG_gettext=no +-OCAML_PKG_oUnit=no ++OCAML_PKG_ounit2=no + ounit_is_v2=no + have_Bytes_module=no + AS_IF([test "x$OCAMLC" != "xno"],[ +@@ -117,11 +117,11 @@ AS_IF([test "x$OCAMLC" != "xno"],[ + + GUESTFS_CREATE_COMMON_GETTEXT_ML([common/mlgettext/common_gettext.ml]) + +- AC_CHECK_OCAML_PKG(oUnit) ++ AC_CHECK_OCAML_PKG(ounit2) + + # oUnit >= 2 is required, so check that it has OUnit2. +- if test "x$OCAML_PKG_oUnit" != "xno"; then +- AC_CHECK_OCAML_MODULE(ounit_is_v2,[OUnit.OUnit2],OUnit2,[+oUnit]) ++ if test "x$OCAML_PKG_ounit2" != "xno"; then ++ AC_CHECK_OCAML_MODULE(ounit_is_v2,[OUnit.OUnit2],OUnit2,[+ounit2]) + fi + + # Check if we have the 'Bytes' module. If not (OCaml < 4.02) then +@@ -141,7 +141,7 @@ AS_IF([test "x$OCAMLC" != "xno"],[ + AM_CONDITIONAL([HAVE_OCAML_PKG_GETTEXT], + [test "x$OCAML_PKG_gettext" != "xno"]) + AM_CONDITIONAL([HAVE_OCAML_PKG_OUNIT], +- [test "x$OCAML_PKG_oUnit" != "xno" && test "x$ounit_is_v2" != "xno"]) ++ [test "x$OCAML_PKG_ounit2" != "xno" && test "x$ounit_is_v2" != "xno"]) + + AC_CHECK_PROG([OCAML_GETTEXT],[ocaml-gettext],[ocaml-gettext],[no]) + AM_CONDITIONAL([HAVE_OCAML_GETTEXT], +-- +2.29.0.rc2 + diff --git a/guestfs-tools/guestfs-tools.spec b/guestfs-tools/guestfs-tools.spec index 73d275e..de3f466 100644 --- a/guestfs-tools/guestfs-tools.spec +++ b/guestfs-tools/guestfs-tools.spec @@ -26,7 +26,7 @@ Summary: Tools to access and modify virtual machine disk images Name: guestfs-tools Version: 1.45.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ # Build only for architectures that have a kernel @@ -51,6 +51,7 @@ Patch2: 0002-po-docs-Don-t-try-to-install-.3-and-.5-files-which-d.patch Patch3: 0003-build-Remove-dependency-on-gobject-introspection.patch Patch4: 0004-build-Remove-dependency-on-perl-Sys-Virt.patch Patch5: 0005-builder-Get-rid-of-etc-xdg-and-XDG_CONFIG_DIRS-nonse.patch +Patch6: 0006-builder-Use-correct-ounit2-module.patch %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool, gettext-devel @@ -89,6 +90,7 @@ BuildRequires: perl(Expect) %endif BuildRequires: bash-completion BuildRequires: /usr/bin/qemu-img +BuildRequires: perl(Locale::TextDomain) BuildRequires: perl(Sys::Guestfs) BuildRequires: perl(Win::Hivex) BuildRequires: perl(Win::Hivex::Regedit) @@ -388,5 +390,9 @@ gzip --best installed-docs/*.xml %changelog +* Wed Mar 24 2021 Richard W.M. Jones - 1.45.2-2 +- Add perl(Locale::TextDomain) dependency for virt-win-reg. +- Fix ounit2 dependency upstream. + * Tue Mar 23 2021 Richard W.M. Jones - 1.45.2-1 - New guestfs-tools package, split off from libguestfs. -- 1.8.3.1