Skip to content

Commit

Permalink
Packaging: Require leapp-framework 6.x + update leapp deps
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
pirat89 authored and Michal Hecko committed Nov 10, 2024
1 parent c7be278 commit 8c378f6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion packaging/leapp-repository.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion packaging/other_specs/leapp-el7toel8-deps.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -112,6 +112,7 @@ Requires: python3
Requires: python3-six
Requires: python3-setuptools
Requires: python3-requests
Requires: python3-PyYAML


%description -n %{ldname}
Expand Down

0 comments on commit 8c378f6

Please sign in to comment.