(I opened a pagure ticket about this too: https://pagure.io/fonts-rpm-macros/issue/26)
Since the git repo for fonts-rpm-macros has been out of sync for 5+ years now due to the Fedora package reverting back to 2.0 at that time. We have been thinking it would be better to fork a new branch and probably also move to a new repo at the same time given that Fedora use of pagure.io is being replaced with Fedora Forge https://forge.fedoraproject.org/ soon.
My thought is roughly that we should fork off the current main branch from the 2.0.5 tag (corresponding to the current fedora tarball) and then cherry pick recent commits and/or apply patches from the Fedora package to create a new repo in sync with what is currently being shipped. Given that it is an official Fedora project it seems most natural to either host it in the new Fedora Forge (Forgejo), or gitlab.com/fedora or possibly github. One consideration brought up was CI, though currently there isn't any but I don't know how much we will lean on that.
Any thoughts or particular suggestions?
Jens
On Tue, Sep 09, 2025 at 06:06:13PM +0800, Jens-Ulrik Petersen via fonts wrote:
(I opened a pagure ticket about this too: https://pagure.io/fonts-rpm-macros/issue/26)
Since the git repo for fonts-rpm-macros has been out of sync for 5+ years now due to the Fedora package reverting back to 2.0 at that time. We have been thinking it would be better to fork a new branch and probably also move to a new repo at the same time given that Fedora use of pagure.io is being replaced with Fedora Forge https://forge.fedoraproject.org/ soon.
My thought is roughly that we should fork off the current main branch from the 2.0.5 tag (corresponding to the current fedora tarball) and then cherry pick recent commits and/or apply patches from the Fedora package to create a new repo in sync with what is currently being shipped. Given that it is an official Fedora project it seems most natural to either host it in the new Fedora Forge (Forgejo), or gitlab.com/fedora or possibly github. One consideration brought up was CI, though currently there isn't any but I don't know how much we will lean on that.
Any thoughts or particular suggestions?
Is the upstream package used outside of Fedora? If not, then the usual suggestion would be make this a downstream-only package and make the repo on src.fp.o the canonical location. We did that in the past with various packages (e.g. setup, redhat-rpm-config) and it simplifies maintanance and makes it easier to deal with multiple slightly-different fedora branches.
Zbyszek
Hi,
On Tue, Sep 9, 2025 at 3:36 PM Jens-Ulrik Petersen via i18n i18n@lists.fedoraproject.org wrote:
(I opened a pagure ticket about this too: https://pagure.io/fonts-rpm-macros/issue/26)
Since the git repo for fonts-rpm-macros has been out of sync for 5+ years now due to the Fedora package reverting back to 2.0 at that time. We have been thinking it would be better to fork a new branch and probably also move to a new repo at the same time given that Fedora use of pagure.io is being replaced with Fedora Forge soon.
My thought is roughly that we should fork off the current main branch from the 2.0.5 tag (corresponding to the current fedora tarball) and then cherry pick recent commits and/or apply patches from the Fedora package to create a new repo in sync with what is currently being shipped.
Given that it is an official Fedora project it seems most natural to either host it in the new Fedora Forge (Forgejo), or gitlab.com/fedora or possibly github. One consideration brought up was CI, though currently there isn't any but I don't know how much we will lean on that.
Any thoughts or particular suggestions?
I have prepared https://pagure.io/fonts-rpm-macros/pull-request/27 which reverts changes/commits in the main branch from 3.0.0 release till 4.0.2 release and then re-applied later commits from 4.0.2 release. Hopefully this will help everything in sync and we can further work and develop or fix any future bugs on this new proposed PR change in the main branch. This proposed PR also includes any missing Fedora package patches which are not in the main branch. Request our I18n and Fonts SIG members to review this PR work. If it looks good we can change the main branch code.
Regards, Parag