From 44c912bf5d85c129adb3fdd4ee386b48893b3609 Mon Sep 17 00:00:00 2001 From: Oleksandr Date: Tue, 4 Feb 2025 17:04:34 +0200 Subject: [PATCH] CLOS-3200: Cherry-pick upstream patch which bumps leapp-framework dependency Cherry-pick of this patch: https://github.com/oamg/leapp-repository/commit/89afbe8cb41f874f32acddc1e1696132f3531677 --- 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 d772851045..b72ffb3b09 100644 --- a/packaging/leapp-repository.spec +++ b/packaging/leapp-repository.spec @@ -100,7 +100,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 c4e0dd90b8..ee021617d6 100644 --- a/packaging/other_specs/leapp-el7toel8-deps.spec +++ b/packaging/other_specs/leapp-el7toel8-deps.spec @@ -10,7 +10,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 @@ -108,6 +108,7 @@ Requires: python3 Requires: python3-six Requires: python3-setuptools Requires: python3-requests +Requires: python3-PyYAML %description -n %{ldname}