Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update rpm.rb #2082

Merged
merged 2 commits into from
Dec 2, 2024
Merged

Update rpm.rb #2082

merged 2 commits into from
Dec 2, 2024

Conversation

wheaney
Copy link
Contributor

@wheaney wheaney commented Oct 29, 2024

Fix how buildroot is specified to better conform with the rpmbuild CLI. The old way was failing with File not found errors.

Fix how buildroot is specified to better conform with the rpmbuild CLI. The old way was failing with `File not found` errors.
@Romain-Geissler-1A
Copy link
Contributor

This should fix #2076

@@ -473,7 +473,7 @@ def output(output_path)
args += ["--define", "dist .#{attributes[:rpm_dist]}"] if attributes[:rpm_dist]

args += [
"--define", "buildroot #{build_path}/BUILD",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would consider doing both just to be on the safe side

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a bad idea, I've put the older argument back in.

Leave old `--define` argument in place for `buildroot`
@Romain-Geissler-1A
Copy link
Contributor

@jordansissel Sorry to ping you directly, but this fix would be needed to make fpm work on Fedora 41 which is now the default fedora since couple of weeks. Would you mind having a look at this proposal ?

carlhoerberg added a commit to 84codes/crystal-container-images that referenced this pull request Nov 11, 2024
carlhoerberg added a commit to 84codes/crystal-container-images that referenced this pull request Nov 11, 2024
@Romain-Geissler-1A
Copy link
Contributor

@jordansissel ping again ;)

@jordansissel jordansissel merged commit c028e71 into jordansissel:main Dec 2, 2024
3 checks passed
@jordansissel
Copy link
Owner

Tests pass so it’s probably ok to merge! Thanks for improving fpm :)

@Romain-Geissler-1A
Copy link
Contributor

Romain-Geissler-1A commented Dec 2, 2024

Thanks. Since this issue is effectively breaking fedora users since the release of fedora 41, would it be possible to also cut a release and publish the resulting gem ? This way fedora users will no longer need to manually patch the gem installation.

@jordansissel
Copy link
Owner

@Romain-Geissler-1A I began working on the release tonight, part of which is attending to a bunch of open PRs; a completed release will happen at some point after that work is done.

@jordansissel
Copy link
Owner

fpm v1.16.0 is released :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants