From a4066fc2970a80b087f42653dc1841d1283787d3 Mon Sep 17 00:00:00 2001 From: Otto Liljalaakso Date: Jun 29 2025 14:15:40 +0000 Subject: [PATCH 1/3] Fix some items to use recommended docopt notation --- 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..240ebc2 100644 --- a/modules/ROOT/pages/New_Package_Process_for_Existing_Contributors.adoc +++ b/modules/ROOT/pages/New_Package_Process_for_Existing_Contributors.adoc @@ -49,7 +49,7 @@ Fix any blockers that the reviewer(s) point out. ** Make sure the reviewer is the Assignee in your Bugzilla ticket. -** Request a distgit repository with `fedpkg request-repo PACKAGE-NAME BUGZILLA-TICKET-NUMBER`. +** Request a distgit repository with `fedpkg request-repo `. (xref:Package_Maintenance_Guide.adoc[Package Maintenance Guide] has more information about `fedpkg`.) You might need to get a pagure-API-token before being able to successfully request the repo. @@ -67,7 +67,7 @@ checkout the distgit repository with `fedpkg clone `. . Import your srpm -** First `fkinit -u username` +** First `fkinit -u ` ** 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. 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 0addbdb..ab0931e 100644 --- a/modules/ROOT/pages/New_Package_Process_for_New_Contributors.adoc +++ b/modules/ROOT/pages/New_Package_Process_for_New_Contributors.adoc @@ -249,7 +249,7 @@ git push fedpkg build .... -Obviously, replace `PATH_TO_SRPM` with the full path +Obviously, replace `` with the full path (not URL) to your approved SRPM, and `XXXXXX` with the package review bug number. From 1a3ca82521fb5b3ff471ffefeb593d8359689601 Mon Sep 17 00:00:00 2001 From: Otto Liljalaakso Date: Jun 29 2025 14:18:13 +0000 Subject: [PATCH 2/3] Add line breaks to some excessively long lines --- 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 240ebc2..49590b9 100644 --- a/modules/ROOT/pages/New_Package_Process_for_Existing_Contributors.adoc +++ b/modules/ROOT/pages/New_Package_Process_for_Existing_Contributors.adoc @@ -29,7 +29,8 @@ then you can use your storage at https://fedorapeople.org for this. . Make sure you have a Bugzilla account at bugzilla.redhat.com -. Fill out https://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Fedora&format=fedora-review[Bugzilla Fedora review form] to create a review request. +. Fill out https://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Fedora&format=fedora-review[Bugzilla Fedora review form] +to create a review request. ** Make sure you put the name of the package in the `Review Summary` field, along with a very brief summary of what it is @@ -69,7 +70,12 @@ checkout the distgit repository with `fedpkg clone `. ** First `fkinit -u ` -** 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 (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. ** Obviously, replace `libfoo-x.x.x.src.rpm` with the full path to your approved SRPM. @@ -127,7 +133,8 @@ please submit it for inclusion in the `fedora-updates` repository for those versions of Fedora. See xref:Package_Update_Guide.adoc#Later_Branched_and_stable_releases[Package Update Guide] for more details. -. Add the package to the https://fedoraproject.org/wiki/How_to_use_and_edit_comps.xml_for_package_groups[comps file(s)] if appropriate. +. Add the package to the https://fedoraproject.org/wiki/How_to_use_and_edit_comps.xml_for_package_groups[comps file(s)] +if appropriate. . Consider enabling xref:Upstream_Release_Monitoring.adoc[Upstream Release Monitoring] for the package. 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 ab0931e..2b2047a 100644 --- a/modules/ROOT/pages/New_Package_Process_for_New_Contributors.adoc +++ b/modules/ROOT/pages/New_Package_Process_for_New_Contributors.adoc @@ -37,7 +37,8 @@ for packages under review. * If you don't know how to create an RPM package, see the xref:Packaging_Tutorial.adoc[Packaging Tutorial]. -* Make sure that your package meets the xref:packaging-guidelines::index.adoc[Packaging Guidelines] and xref:packaging-guidelines::Naming.adoc[Package Naming Guidelines]. +* Make sure that your package meets the xref:packaging-guidelines::index.adoc[Packaging Guidelines] +and xref:packaging-guidelines::Naming.adoc[Package Naming Guidelines]. * Be aware of the xref:packaging-guidelines::ReviewGuidelines.adoc[Package Review Guidelines] (they will be used during the package review). @@ -370,7 +371,8 @@ If appropriate for the package, make it available in "comps" files so that it can be selected during installation and included in dnf package group operations. -See https://fedoraproject.org/wiki/How_to_use_and_edit_comps.xml_for_package_groups?rd=PackageMaintainers/CompsXml[How to use and edit comps.xml for package groups] for more info. +See https://fedoraproject.org/wiki/How_to_use_and_edit_comps.xml_for_package_groups?rd=PackageMaintainers/CompsXml[How to use and edit comps.xml for package groups] +for more info. [#watch_for_updates] === Watch for updates From eba3b88b6da73bbca1dd736f7a25c7f9062e1151 Mon Sep 17 00:00:00 2001 From: Otto Liljalaakso Date: Jun 29 2025 14:18:39 +0000 Subject: [PATCH 3/3] Put more trust on Bodhi automation when closing review tickets If instructions and recommendations are followed, Bodhi will automatically close the review issues, so instead of asking to close it manually, just mention that Bodhi will do it. Include instructions for closing the issue automatically in case such action is needed. Previously, two options for resolution were given, neither matching what Bodhi actually uses. Switch to `ERRATA` to get the same result as the default path where Bodhi auto-close works as intended. --- 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 49590b9..220358f 100644 --- a/modules/ROOT/pages/New_Package_Process_for_Existing_Contributors.adoc +++ b/modules/ROOT/pages/New_Package_Process_for_Existing_Contributors.adoc @@ -121,12 +121,10 @@ 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 the package built successfully, +Bodhi should automatically close the Bugzilla issue. +If it for some reason does not, +you can manually set issue status to `CLOSED` with resolution `ERRATA`, . 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 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 2b2047a..b12687c 100644 --- a/modules/ROOT/pages/New_Package_Process_for_New_Contributors.adoc +++ b/modules/ROOT/pages/New_Package_Process_for_New_Contributors.adoc @@ -330,6 +330,11 @@ Commit any needed changes to git, bump the SPEC release number, and request a new build. +If the package builds successfully, +Bodhi should automatically close the Bugzilla issue. +If it for some reason does not, +you can manually set issue status to `CLOSED` with resolution `ERRATA`, + [#submit_package_as_update_in_bodhi] === Submit Package as Update in Bodhi