From d079a38dabffa9101bb1fb0dc4dae0d18e3c4df9 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Sat, 2 Mar 2024 14:45:21 +0100
Subject: [PATCH] configs: Rawhide to accept GPG key from future Fedora
 Rawhide+1

Fixes: #1338
---
 mock-core-configs/etc/mock/templates/fedora-rawhide.tpl      | 2 +-
 mock-core-configs/mock-core-configs.spec                     | 2 +-
 releng/release-notes-next/fedora-rawhide-key-plus-one.config | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 releng/release-notes-next/fedora-rawhide-key-plus-one.config

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..1f0e3b3fb
--- /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).  This change is implemented
+to address the typically short and unnecessary inconvenience during [the Fedora
+branching process][issue#1338].