From 89afbe8cb41f874f32acddc1e1696132f3531677 Mon Sep 17 00:00:00 2001 From: Petr Stodulka Date: Fri, 8 Nov 2024 17:40:01 +0100 Subject: [PATCH 31/40] Packaging: Require leapp-framework 6.x + update leapp deps The leapp actors configuration feature is present since leapp-framework 6.0. Update the dependencies to ensure the correct version of the framework is installed on the system. Also, leapp requirements have been updated - requiring python3-PyYAML as it requires YAML parser, bumping leapp-framework-dependencies to 6. Address the change in leapp-deps metapackage to satisfy leapp dependencies during the upgrade process. --- packaging/leapp-repository.spec | 2 +- packaging/other_specs/leapp-el7toel8-deps.spec | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packaging/leapp-repository.spec b/packaging/leapp-repository.spec index 0d63ba02..570d0df2 100644 --- a/packaging/leapp-repository.spec +++ b/packaging/leapp-repository.spec @@ -120,7 +120,7 @@ Requires: leapp-repository-dependencies = %{leapp_repo_deps} # IMPORTANT: this is capability provided by the leapp framework rpm. # Check that 'version' instead of the real framework rpm version. -Requires: leapp-framework >= 5.0, leapp-framework < 6 +Requires: leapp-framework >= 6.0, leapp-framework < 7 # Since we provide sub-commands for the leapp utility, we expect the leapp # tool to be installed as well. diff --git a/packaging/other_specs/leapp-el7toel8-deps.spec b/packaging/other_specs/leapp-el7toel8-deps.spec index d9e94faa..2c662a37 100644 --- a/packaging/other_specs/leapp-el7toel8-deps.spec +++ b/packaging/other_specs/leapp-el7toel8-deps.spec @@ -14,7 +14,7 @@ %define leapp_repo_deps 10 -%define leapp_framework_deps 5 +%define leapp_framework_deps 6 # NOTE: the Version contains the %{rhel} macro just for the convenience to # have always upgrade path between newer and older deps packages. So for @@ -112,6 +112,7 @@ Requires: python3 Requires: python3-six Requires: python3-setuptools Requires: python3-requests +Requires: python3-PyYAML %description -n %{ldname} -- 2.47.0