From c4f47308b73b0d00ed23c28f7f6363489543d4d2 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Mon, 13 Jun 2022 11:28:16 -0400
Subject: [PATCH] Revert "skip RPM-GPG-KEY-redhat-release installation on
 non-centos RHEL"

Bad commit

This reverts commit 3f652c678195973d3b635b86623f828a2b039383.
---
 containers-common.spec | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/containers-common.spec b/containers-common.spec
index da8f7d0..7fe2994 100644
--- a/containers-common.spec
+++ b/containers-common.spec
@@ -54,9 +54,7 @@ Source16: %{github_containers}/skopeo/%{skopeo_branch}/default.yaml
 Source17: %{github_containers}/skopeo/%{skopeo_branch}/default-policy.json
 Source18: %{github_containers}/storage/%{storage_branch}/docs/containers-storage.conf.5.md
 Source19: %{github_containers}/storage/%{storage_branch}/storage.conf
-%if 0%{?centos}
 Source20: RPM-GPG-KEY-redhat-release
-%endif
 Source21: registry.access.redhat.com.yaml
 Source22: registry.redhat.io.yaml
 Source23: %{github_containers}/common/%{common_branch}/docs/Containerfile.5.md
@@ -94,9 +92,7 @@ cp %{SOURCE16} .
 cp %{SOURCE17} policy.json
 cp %{SOURCE18} .
 cp %{SOURCE19} .
-%if 0%{?centos}
 cp %{SOURCE20} .
-%endif
 cp %{SOURCE21} .
 cp %{SOURCE22} .
 cp %{SOURCE23} .
@@ -126,12 +122,11 @@ install -Dp -m0644 storage.conf -t %{buildroot}%{_datadir}/containers
 install -Dp -m0644 registries.conf -t %{buildroot}%{_sysconfdir}/containers
 install -Dp -m0644 000-shortnames.conf -t %{buildroot}%{_sysconfdir}/containers/registries.conf.d
 install -Dp -m0644 policy.json -t %{buildroot}%{_sysconfdir}/containers
-%if 0%{?centos}
 install -Dp -m0644 RPM-GPG-KEY-redhat-release -t %{buildroot}%{_sysconfdir}/pki/rpm-gpg
-%endif
 install -Dp -m0644 registry.access.redhat.com.yaml -t %{buildroot}%{_sysconfdir}/containers/registries.d
 install -Dp -m0644 registry.redhat.io.yaml -t %{buildroot}%{_sysconfdir}/containers/registries.d
 
+
 # install manpages
 for FILE in $(ls -a man5 | grep 5); do
     install -Dp -m0644 man5/$FILE -t %{buildroot}%{_mandir}/man5
@@ -159,9 +154,7 @@ ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secret
 %config(noreplace) %{_sysconfdir}/containers/policy.json
 %config(noreplace) %{_sysconfdir}/containers/registries.conf
 %config(noreplace) %{_sysconfdir}/containers/registries.conf.d/000-shortnames.conf
-%if 0%{?centos}
 %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
-%endif
 %config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml
 %{_sysconfdir}/containers/registries.d/registry.redhat.io.yaml
 %{_sysconfdir}/containers/registries.d/registry.access.redhat.com.yaml