It's confusing enough to keep track of which patches are where.
Combine the patches that are related in a single file.
Also, don't do
# Bugfixes that are only relevant until next rebase of the package.
# Patch1001: 1001-some.patch
Patch11: 0001-cloud-setup-use-nm_strv_dup_packed-in-nm_http_client.patch
Related: #2151987
