diff --git a/mock-core-configs/etc/mock/templates/fedora-rawhide.tpl b/mock-core-configs/etc/mock/templates/fedora-rawhide.tpl index d30b52e21..54bf5e25e 100644 --- a/mock-core-configs/etc/mock/templates/fedora-rawhide.tpl +++ b/mock-core-configs/etc/mock/templates/fedora-rawhide.tpl @@ -42,7 +42,7 @@ user_agent={{ user_agent }} {%- macro rawhide_gpg_keys() -%} file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary -{%- for version in [releasever|int, releasever|int - 1] +{%- for version in [releasever|int, releasever|int - 1, releasever|int + 1] %} file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-{{ version }}-primary {%- endfor %} {%- endmacro %} diff --git a/mock-core-configs/mock-core-configs.spec b/mock-core-configs/mock-core-configs.spec index 6f9110b8b..f6e363e88 100644 --- a/mock-core-configs/mock-core-configs.spec +++ b/mock-core-configs/mock-core-configs.spec @@ -22,7 +22,7 @@ BuildArch: noarch Provides: mock-configs # distribution-gpg-keys contains GPG keys used by mock configs -Requires: distribution-gpg-keys >= 1.98 +Requires: distribution-gpg-keys >= 1.101 # specify minimal compatible version of mock Requires: mock >= 5.4.post1 Requires: mock-filesystem diff --git a/releng/release-notes-next/fedora-rawhide-key-plus-one.config b/releng/release-notes-next/fedora-rawhide-key-plus-one.config new file mode 100644 index 000000000..448aee0ed --- /dev/null +++ b/releng/release-notes-next/fedora-rawhide-key-plus-one.config @@ -0,0 +1,4 @@ +Fedora Rawhide configurations, such as releasever=41 now, accept GPG keys from +Fedora releasever+1 (for example, 42, not yet used for RPM signatures). This +change is implemented to address the typically short and unnecessary +inconvenience during [the Fedora branching process][issue#1338] in the future.