diff --git a/containers-common.spec b/containers-common.spec index 944732b..90df79f 100644 --- a/containers-common.spec +++ b/containers-common.spec @@ -40,7 +40,7 @@ Epoch: 5 # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. Version: 0.60.2 -Release: 9%{?dist} +Release: 10%{?dist} License: Apache-2.0 BuildArch: noarch # for BuildRequires: go-md2man @@ -75,6 +75,8 @@ Source13: %{raw_github_url}/image/%{image_branch}/registries.conf Source14: %{raw_github_url}/storage/%{storage_branch}/storage.conf Source15: REKOR-signing-key Source16: SIGSTORE-redhat-release3 +Source17: registry.access.redhat.com.yaml +Source18: registry.redhat.io.yaml %description This package contains common configuration files and documentation for container @@ -182,8 +184,8 @@ install -m0644 %{SOURCE15} %{buildroot}%{_sysconfdir}/pki/sigstore install -m0644 %{SOURCE16} %{buildroot}%{_sysconfdir}/pki/sigstore %endif -install -Dp -m0644 contrib/redhat/registry.access.redhat.com.yaml -t %{buildroot}%{_sysconfdir}/containers/registries.d -install -Dp -m0644 contrib/redhat/registry.redhat.io.yaml -t %{buildroot}%{_sysconfdir}/containers/registries.d +install -Dp -m0644 %{SOURCE17} -t %{buildroot}%{_sysconfdir}/containers/registries.d +install -Dp -m0644 %{SOURCE18} -t %{buildroot}%{_sysconfdir}/containers/registries.d # install manpages install -dp %{buildroot}%{_mandir}/man5 @@ -249,6 +251,10 @@ ln -s ../../../..%{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/ %files extra %changelog +* Wed Oct 30 2024 Jindrich Novy - 5:0.60.2-10 +- don't use registry yaml files from upstream but RHEL10 dedicated ones +- Resolves: RHEL-65203 + * Wed Oct 30 2024 Jindrich Novy - 5:0.60.2-9 - ensure required configurations for RHEL10 is present - Resolves: RHEL-58990