From c37257810633ea87e42d76702f786f633cd62655 Mon Sep 17 00:00:00 2001 From: Vít Ondruch Date: Apr 03 2025 09:15:02 +0000 Subject: [PATCH 1/2] Include `Resolves:` in commit message to autoclose review ticket When `Resolves: rhbz#nnnnn` is included in commit message, Bodhi can figure out the relation of the build to the ticket and automatically close it. --- diff --git a/modules/ROOT/pages/New_Package_Process_for_Existing_Contributors.adoc b/modules/ROOT/pages/New_Package_Process_for_Existing_Contributors.adoc index 5bb1779..77d2b62 100644 --- a/modules/ROOT/pages/New_Package_Process_for_Existing_Contributors.adoc +++ b/modules/ROOT/pages/New_Package_Process_for_Existing_Contributors.adoc @@ -69,7 +69,7 @@ checkout the distgit repository with `fedpkg clone `. ** First `fkinit -u username` -** Then you can import the approved SRPM into the rawhide branch by running `fedpkg import libfoo-x.x.x.src.rpm; git commit -m "Initial import (fedora#nnnnnn)."` (where `nnnnnn` is your Bugzilla package review bug number). If your package is using _autochangelog_, writing the bug number as specified will make Bodhi automatically close the bug when your package is submitted to Rawhide stable repository. +** Then you can import the approved SRPM into the rawhide branch by running `fedpkg import libfoo-x.x.x.src.rpm; git commit -m "Initial import" -m "Resolves: rhbz#nnnnnn"` (where `nnnnnn` is your Bugzilla package review bug number). If your package is using _autochangelog_, writing the bug number as specified will make Bodhi automatically close the bug when your package is submitted to Rawhide stable repository. ** Obviously, replace `libfoo-x.x.x.src.rpm` with the full path to your approved SRPM. diff --git a/modules/ROOT/pages/New_Package_Process_for_New_Contributors.adoc b/modules/ROOT/pages/New_Package_Process_for_New_Contributors.adoc index 9324b59..ba64d96 100644 --- a/modules/ROOT/pages/New_Package_Process_for_New_Contributors.adoc +++ b/modules/ROOT/pages/New_Package_Process_for_New_Contributors.adoc @@ -244,7 +244,7 @@ fedpkg import PATH_TO_SRPM .... # Review Changes, press 'q' to stop; Revert with: git reset --hard HEAD -git commit -m "Initial import (fedora#XXXXXX)." +git commit -m "Initial import" -m "Resolves: rhbz#nnnnnn"` git push fedpkg build .... From d072c2f132fe7f2eccacb3884441ba85f27b0bd9 Mon Sep 17 00:00:00 2001 From: Vít Ondruch Date: Apr 03 2025 09:18:15 +0000 Subject: [PATCH 2/2] Remove the section about closing BZ ticket Bodhi should take care about this, when the `Resolves: rhbz#nnnnn` is used in the ticket. --- diff --git a/modules/ROOT/pages/New_Package_Process_for_Existing_Contributors.adoc b/modules/ROOT/pages/New_Package_Process_for_Existing_Contributors.adoc index 77d2b62..7d20b2a 100644 --- a/modules/ROOT/pages/New_Package_Process_for_Existing_Contributors.adoc +++ b/modules/ROOT/pages/New_Package_Process_for_Existing_Contributors.adoc @@ -115,13 +115,6 @@ Commit any needed changes to git, bump the spec release number and request a new build. -. Close the Bugzilla ticket -(assuming that the package built successfully) - -* You should close it with resolution `NEXTRELEASE` or `RAWHIDE`, -depending on where you built the package. -The resolution field will appear after you set the status field to `CLOSED`. - . If this package will be built for any version of Fedora that is already released please submit it for inclusion in the `fedora-updates` repository for those versions of Fedora.