From f8ddd2542e43538cc34479da947d27651b0d05af Mon Sep 17 00:00:00 2001 From: Otto Liljalaakso Date: Jan 12 2024 11:29:32 +0000 Subject: [PATCH 1/3] Use only space characters in shell snippet with mixed whitespace --- diff --git a/modules/ROOT/pages/Package_Maintenance_Guide.adoc b/modules/ROOT/pages/Package_Maintenance_Guide.adoc index 7e92186..78587bb 100644 --- a/modules/ROOT/pages/Package_Maintenance_Guide.adoc +++ b/modules/ROOT/pages/Package_Maintenance_Guide.adoc @@ -450,8 +450,8 @@ spectool -g somepackage.spec # download the referenced sources to local machine # for the maintainer to do after the pull request has been merged fedpkg mockbuild # check that the changes you made are correct fedpkg new-sources --offline somepackage-0.0.2.tar.gz # update sources file and .gitignore if sources have changed - # the --offline flag skips upload to the lookaside cache - # multiple source files can be specified as required + # the --offline flag skips upload to the lookaside cache + # multiple source files can be specified as required fedpkg diff fedpkg lint git checkout -b my-branch # create a branch to use in the pull request From 1b61e33bb8ecb06749853863f707b2be6730a446 Mon Sep 17 00:00:00 2001 From: Otto Liljalaakso Date: Jan 12 2024 11:29:43 +0000 Subject: [PATCH 2/3] Improve comment on `fedpkg new-sources` for anonymous `fedpkg` usage When `fedpkg new-sources --offline` was added in 52bb1b7b, the earlier comment about not doing `fedpkg new-sources` at all became stale. Remove the stale comment and update, add the part that is still relevant to `fedpkg new-sources` comment. --- diff --git a/modules/ROOT/pages/Package_Maintenance_Guide.adoc b/modules/ROOT/pages/Package_Maintenance_Guide.adoc index 78587bb..3347e41 100644 --- a/modules/ROOT/pages/Package_Maintenance_Guide.adoc +++ b/modules/ROOT/pages/Package_Maintenance_Guide.adoc @@ -446,11 +446,10 @@ cd somepackage gedit somepackage.spec # change the required things in the specfile. # rpmdev-bumpspec is useful for simple version updates spectool -g somepackage.spec # download the referenced sources to local machine - # fedpkg new-sources cannot be performed anonymously, that is left - # for the maintainer to do after the pull request has been merged fedpkg mockbuild # check that the changes you made are correct fedpkg new-sources --offline somepackage-0.0.2.tar.gz # update sources file and .gitignore if sources have changed # the --offline flag skips upload to the lookaside cache + # that is left for the maintainer to do after the pull request has been merged # multiple source files can be specified as required fedpkg diff fedpkg lint From d521d9a53516ed1cef9afdbd8859d54a73e4cfea Mon Sep 17 00:00:00 2001 From: Otto Liljalaakso Date: Jan 12 2024 11:29:43 +0000 Subject: [PATCH 3/3] Limit shell snippet line length in Package Maintenance Guide For some shell snippets, the Package Maintenance Guide page used a style where comment about certain command was written in the same line after the command. Initially, this worked well when the commands were short, but since then some quite long commands have been added, leading to very long lines. Improve readability by swithing to style where comments are on separate lines just before commands. --- diff --git a/modules/ROOT/pages/Package_Maintenance_Guide.adoc b/modules/ROOT/pages/Package_Maintenance_Guide.adoc index 3347e41..2a3d9a2 100644 --- a/modules/ROOT/pages/Package_Maintenance_Guide.adoc +++ b/modules/ROOT/pages/Package_Maintenance_Guide.adoc @@ -290,9 +290,11 @@ fedpkg clone foo cd foo fedpkg sources fedpkg new-sources foo-0.0.2.tar.bz2 -gedit foo.spec # change the required things in the specfile. - # rpmdev-bumpspec is useful for simple version updates -fedpkg mockbuild # check that the changes you made are correct +# Change the required things in the specfile. +# 'rpmdev-bumpspec' is useful for simple version updates. +gedit foo.spec +# Check that the changes you made are correct. +fedpkg mockbuild fedpkg diff fedpkg lint fedpkg commit -p -c # commit and push in one go @@ -399,9 +401,9 @@ and dealing with them as a set. git config --global merge.tool meld fedpkg switch-branch f{{FedoraVersionNumber}} git merge rawhide -# Conflicts occurred -git mergetool # Opens up a meld showing a three way diff of - # the merge, working tree, and the last commit +# Conflicts occurred. +# Open a meld showing a three way diff of the merge, working tree, and the last commit. +git mergetool # Resolved all the conflicts in the GUI git add CONFLICTEDFILES git commit @@ -443,17 +445,22 @@ typical `fedpkg` session might look like this: .... fedpkg clone --anonymous forks/my-username/rpms/somepackage cd somepackage -gedit somepackage.spec # change the required things in the specfile. - # rpmdev-bumpspec is useful for simple version updates -spectool -g somepackage.spec # download the referenced sources to local machine -fedpkg mockbuild # check that the changes you made are correct -fedpkg new-sources --offline somepackage-0.0.2.tar.gz # update sources file and .gitignore if sources have changed - # the --offline flag skips upload to the lookaside cache - # that is left for the maintainer to do after the pull request has been merged - # multiple source files can be specified as required +# change the required things in the specfile. +# 'rpmdev-bumpspec' is useful for simple version updates. +gedit somepackage.spec +# download the referenced sources to local machine +spectool -g somepackage.spec +# check that the changes you made are correct +fedpkg mockbuild +# Update sources file and .gitignore if sources have changed. +# The --offline flag skips upload to the lookaside cache. +# That is left for the maintainer to do after the pull request has been merged. +# Multiple source files can be specified as required. +fedpkg new-sources --offline somepackage-0.0.2.tar.gz fedpkg diff fedpkg lint -git checkout -b my-branch # create a branch to use in the pull request +# create a branch to use in the pull request +git checkout -b my-branch git status git add . git commit