Implement rich dependencies in gem2rpm templates #10025
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
evgeni
reviewed
Nov 24, 2023
evgeni
approved these changes
Nov 24, 2023
For most templates this is pretty straight forward, but for foreman_plugin.spec.erb it combines asset reequirements into the spec.extensions block. That was already using the more modern runtime_requirements.virtualize methods to generate a correct rpm dependency list. This was never noticed because we (thankfully) don't have foreman plugins with native extensions.
ekohl
force-pushed
the
rpm/develop-update-gem2rpm-with-rich-deps
branch
from
e053547 to
a7a0cbd
Compare
|
I've merged the block that requires gcc and declares it as noarch in a simple if/else condition. Hopefully the end blocks are a bit easier to follow now. |
evgeni
approved these changes
Nov 24, 2023
ekohl
commented
Nov 24, 2023
Comment on lines
+70
to
+71
| <% build_requires = dep.requirement.map { |req| requirement(dep.name, req) } -%> | ||
| BuildRequires: <%= build_requires.size > 1 ? "(#{build_requires.join(' with ')})" : build_requires.first %> |
There was a problem hiding this comment.
fedora-ruby/gem2rpm#124 would make this:
Suggested change
| <% build_requires = dep.requirement.map { |req| requirement(dep.name, req) } -%> | |
| BuildRequires: <%= build_requires.size > 1 ? "(#{build_requires.join(' with ')})" : build_requires.first %> | |
| BuildRequires: <%= dep.to_rich_rpm %> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For most templates this is pretty straight forward, but for foreman_plugin.spec.erb it combines asset reequirements into the spec.extensions block. That was already using the more modern runtime_requirements.virtualize methods to generate a correct rpm dependency list. This was never noticed because we (thankfully) don't have foreman plugins with native extensions.