Skip to content

fix: add dnf5 command for Fedora in RPM package instructions#36527

Merged
techknowlogick merged 4 commits intogo-gitea:mainfrom
yshyuk:fix/issue-35330-dnf5-command
Feb 9, 2026
Merged

fix: add dnf5 command for Fedora in RPM package instructions#36527
techknowlogick merged 4 commits intogo-gitea:mainfrom
yshyuk:fix/issue-35330-dnf5-command

Conversation

@yshyuk
Copy link
Contributor

@yshyuk yshyuk commented Feb 3, 2026

Summary

Add support for Fedora 41+ which uses dnf5 with different command syntax for adding repositories.

Changes

  • Added new locale key packages.rpm.distros.fedora for Fedora (dnf5)
  • Added dnf5 command in RPM package template: dnf config-manager addrepo --from-repofile=<URL>
  • Kept existing dnf4 command (--add-repo) for RHEL/Rocky Linux compatibility

Background

Fedora 41+ uses dnf5 which has different syntax:

  • dnf4 (RHEL/Rocky): dnf config-manager --add-repo <URL>
  • dnf5 (Fedora 41+): dnf config-manager addrepo --from-repofile=<URL>

Closes #35330

@yshyuk
fix: add dnf5 command for Fedora in RPM package instructions
94caaaf 
Add support for Fedora 41+ which uses dnf5 with different syntax:
- dnf config-manager addrepo --from-repofile=<URL>

The existing dnf4 command (--add-repo) is kept for RHEL/Rocky Linux.

Closes go-gitea#35330
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 3, 2026
@github-actions github-actions bot added the modifies/templates This PR modifies the template files label Feb 3, 2026
@techknowlogick techknowlogick added type/docs This PR mainly updates/creates documentation skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. backport/v1.25 labels Feb 3, 2026
@silverwind
Copy link
Member

silverwind commented Feb 3, 2026 •
edited
Loading

Seems ok to keep 2 sections for now, RHEL will eventually get DNF 5, but that should be around 2028.

silverwind
silverwind reviewed Feb 3, 2026
View reviewed changes
wxiaoguang
wxiaoguang reviewed Feb 4, 2026
View reviewed changes
templates/package/content/rpm.tmpl Outdated
dnf config-manager --add-repo <origin-url data-url="{{AppSubUrl}}/api/packages/{{$.PackageDescriptor.Owner.Name}}/rpm{{$group}}.repo"></origin-url>
{{- end}}

# {{ctx.Locale.Tr "packages.rpm.distros.fedora"}}
Copy link
Contributor

@wxiaoguang wxiaoguang Feb 4, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

It's better to remove the translation, and just write

# Fedora 41+ (dnf5)

Because the distro name and toolchain name are neither translatable.

@wxiaoguang wxiaoguang removed the type/docs This PR mainly updates/creates documentation label Feb 4, 2026
@yshyuk
Copy link
Contributor Author

yshyuk commented Feb 8, 2026

Thanks for the review!

@wxiaoguang Good point - distro and toolchain names shouldn't be translated. I'll remove the locale key and hardcode it directly in the template.

@silverwind I'll use the proper spelling "DNF5" as suggested.

I'll update the PR

@yshyuk
refactor: hardcode Fedora label instead of locale key
452a952 
- Remove packages.rpm.distros.fedora locale key
- Use 'Fedora 41+ (DNF5)' directly in template
- Distro/toolchain names are not translatable
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Feb 9, 2026
@wxiaoguang
Update locale_en-US.json
afa4ed6 
Signed-off-by: wxiaoguang <wxiaoguang@gmail.com>
@techknowlogick techknowlogick enabled auto-merge (squash) February 9, 2026 15:44
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Feb 9, 2026
@techknowlogick techknowlogick added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Feb 9, 2026
@techknowlogick techknowlogick merged commit 94437ea into go-gitea:main Feb 9, 2026
24 checks passed
@GiteaBot GiteaBot added this to the 1.26.0 milestone Feb 9, 2026
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Feb 9, 2026
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Feb 9, 2026
@yshyuk @GiteaBot
fix: add dnf5 command for Fedora in RPM package instructions (go-gite…
8858594 
…a#36527)

Add support for Fedora 41+ which uses dnf5 with different command syntax
for adding repositories.

- **dnf4 (RHEL/Rocky):** `dnf config-manager --add-repo <URL>`
- **dnf5 (Fedora 41+):** `dnf config-manager addrepo
--from-repofile=<URL>`

Closes go-gitea#35330
@GiteaBot GiteaBot mentioned this pull request Feb 9, 2026
Merged
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Feb 9, 2026
silverwind pushed a commit that referenced this pull request Feb 10, 2026
@GiteaBot @yshyuk
fix: add dnf5 command for Fedora in RPM package instructions (#36527) (…
9084339 
…#36572)

Backport #36527 by @yshyuk

## Summary
Add support for Fedora 41+ which uses dnf5 with different command syntax
for adding repositories.

## Changes
- Added new locale key `packages.rpm.distros.fedora` for Fedora (dnf5)
- Added dnf5 command in RPM package template: `dnf config-manager
addrepo --from-repofile=<URL>`
- Kept existing dnf4 command (`--add-repo`) for RHEL/Rocky Linux
compatibility

## Background
Fedora 41+ uses dnf5 which has different syntax:
- **dnf4 (RHEL/Rocky):** `dnf config-manager --add-repo <URL>`
- **dnf5 (Fedora 41+):** `dnf config-manager addrepo
--from-repofile=<URL>`

Closes #35330

Co-authored-by: yshyuk <43194469+yshyuk@users.noreply.github.com>
silverwind added a commit to silverwind/gitea that referenced this pull request Feb 12, 2026
@silverwind
Merge remote-tracking branch 'origin/main' into dropdowncss
a4d46ca 
* origin/main: (34 commits)
  Fine tune diff highlighting (go-gitea#36592)
  Add code editor setting dropdowns (go-gitea#36534)
  Update to go 1.26.0 and golangci-lint 2.9.0 (go-gitea#36588)
  Improve diff highlighting (go-gitea#36583)
  Fix markup code block layout (go-gitea#36578)
  Remove striped tables in UI (go-gitea#36509)
  Fix vertical alignment of `.commit-sign-badge` children (go-gitea#36570)
  Fix mirror sync parser and fix mirror messages (go-gitea#36504)
  Update JS and PY deps (go-gitea#36576)
  Add viewer controller for mermaid (zoom, drag) (go-gitea#36557)
  Misc typescript tweaks (go-gitea#36523)
  Use full-file highlighting for diff sections (go-gitea#36561)
  fix(diff): reprocess htmx content after loading more files (go-gitea#36568)
  [skip ci] Updated translations via Crowdin
  Add wrap to runner label list (go-gitea#36565)
  fix: add dnf5 command for Fedora in RPM package instructions (go-gitea#36527)
  Enable pagination on GiteaDownloader.getIssueReactions() (go-gitea#36549)
  Refactor merge conan and container auth preserve actions taskID (go-gitea#36560)
  Fix assignee sidebar links and empty placeholder after go-gitea#32465 refactor (go-gitea#36559)
  Fix various version parsing problems (go-gitea#36553)
  ...
silverwind added a commit to silverwind/gitea that referenced this pull request Feb 12, 2026
@silverwind
Merge remote-tracking branch 'origin/main' into reltime
9108450 
* origin/main: (152 commits)
  Fine tune diff highlighting (go-gitea#36592)
  Add code editor setting dropdowns (go-gitea#36534)
  Update to go 1.26.0 and golangci-lint 2.9.0 (go-gitea#36588)
  Improve diff highlighting (go-gitea#36583)
  Fix markup code block layout (go-gitea#36578)
  Remove striped tables in UI (go-gitea#36509)
  Fix vertical alignment of `.commit-sign-badge` children (go-gitea#36570)
  Fix mirror sync parser and fix mirror messages (go-gitea#36504)
  Update JS and PY deps (go-gitea#36576)
  Add viewer controller for mermaid (zoom, drag) (go-gitea#36557)
  Misc typescript tweaks (go-gitea#36523)
  Use full-file highlighting for diff sections (go-gitea#36561)
  fix(diff): reprocess htmx content after loading more files (go-gitea#36568)
  [skip ci] Updated translations via Crowdin
  Add wrap to runner label list (go-gitea#36565)
  fix: add dnf5 command for Fedora in RPM package instructions (go-gitea#36527)
  Enable pagination on GiteaDownloader.getIssueReactions() (go-gitea#36549)
  Refactor merge conan and container auth preserve actions taskID (go-gitea#36560)
  Fix assignee sidebar links and empty placeholder after go-gitea#32465 refactor (go-gitea#36559)
  Fix various version parsing problems (go-gitea#36553)
  ...
Sirherobrine23 pushed a commit to Sirherobrine23/gitea that referenced this pull request Mar 4, 2026
@yshyuk @Sirherobrine23
fix: add dnf5 command for Fedora in RPM package instructions (go-gite…
be55427 
…a#36527)

Add support for Fedora 41+ which uses dnf5 with different command syntax
for adding repositories.

- **dnf4 (RHEL/Rocky):** `dnf config-manager --add-repo <URL>`
- **dnf5 (Fedora 41+):** `dnf config-manager addrepo
--from-repofile=<URL>`

Closes go-gitea#35330
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wxiaoguang wxiaoguang wxiaoguang left review comments

@silverwind silverwind silverwind approved these changes

@techknowlogick techknowlogick techknowlogick approved these changes

Assignees

No one assigned

Labels

backport/done All backports for this PR have been created backport/v1.25 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/templates This PR modifies the template files skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.

Projects

None yet

Milestone

1.26.0

Development

Successfully merging this pull request may close these issues.

Dnf command to add repository is not up to date

5 participants

@yshyuk @silverwind @techknowlogick @wxiaoguang @GiteaBot