From 1b99a9f31373032d4d6167e36f59c8b1b88e21f1 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 15 Nov 2022 10:41:55 -0500
Subject: [PATCH] import containers-common-1-45.el9_1

---
 .containers-common.metadata  | 1 +
 .gitignore                   | 1 +
 SPECS/containers-common.spec | 9 ++++++++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.containers-common.metadata b/.containers-common.metadata
index e69de29..d153956 100644
--- a/.containers-common.metadata
+++ b/.containers-common.metadata
@@ -0,0 +1 @@
+a72daf8585b41529269cdffcca3a0b3d4e2f21cd SOURCES/RPM-GPG-KEY-redhat-beta
diff --git a/.gitignore b/.gitignore
index e69de29..8caeece 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+SOURCES/RPM-GPG-KEY-redhat-beta
diff --git a/SPECS/containers-common.spec b/SPECS/containers-common.spec
index 9664244..d38b5fb 100644
--- a/SPECS/containers-common.spec
+++ b/SPECS/containers-common.spec
@@ -12,7 +12,7 @@
 Epoch: 2
 Name: containers-common
 Version: 1
-Release: 44%{?dist}
+Release: 45%{?dist}
 Summary: Common configuration and documentation for containers
 License: ASL 2.0
 ExclusiveArch: %{go_arches}
@@ -60,6 +60,7 @@ Source25: https://raw.githubusercontent.com/containers/skopeo/%{skopeo_branch}/d
 # FIXME: fix the branch once these are available via regular c/common branch
 Source26: https://raw.githubusercontent.com/containers/common/main/docs/Containerfile.5.md
 Source27: https://raw.githubusercontent.com/containers/common/main/docs/containerignore.5.md
+Source28: RPM-GPG-KEY-redhat-beta
 
 # scripts used for synchronization with upstream and shortname generation
 Source100: update.sh
@@ -90,6 +91,7 @@ install -m0644 %{SOURCE20} %{buildroot}%{_sysconfdir}/containers/registries.conf
 %if !0%{?rhel} || 0%{?centos}
 install -dp %{buildroot}%{_sysconfdir}/pki/rpm-gpg
 install -m0644 %{SOURCE21} %{buildroot}%{_sysconfdir}/pki/rpm-gpg
+install -m0644 %{SOURCE28} %{buildroot}%{_sysconfdir}/pki/rpm-gpg
 %endif
 install -dp %{buildroot}%{_sysconfdir}/containers/registries.d
 install -m0644 %{SOURCE22} %{buildroot}%{_sysconfdir}/containers/registries.d
@@ -148,6 +150,7 @@ EOF
 %dir %{_sysconfdir}/containers/registries.conf.d
 %if !0%{?rhel} || 0%{?centos}
 %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta
 %endif
 %config(noreplace) %{_sysconfdir}/containers/policy.json
 %config(noreplace) %{_sysconfdir}/containers/storage.conf
@@ -167,6 +170,10 @@ EOF
 %{_datadir}/rhel/secrets/*
 
 %changelog
+* Thu Oct 13 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-45
+- add beta GPG key
+- Resolves: #2123611
+
 * Tue Aug 23 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-44
 - exclude non-go arches because of go-md2man
 - Related: #2061316