configs: Rawhide to accept GPG key from future Fedora Rawhide+1

Fixes: #1338
rpm-software-management · Mar 2, 2024 · daf35e8 · daf35e8
1 parent fc1f7d4
commit daf35e8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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.