diff --git a/containers-common.spec b/containers-common.spec index 6b785f8..01cfb61 100644 --- a/containers-common.spec +++ b/containers-common.spec @@ -12,7 +12,7 @@ Epoch: 2 Name: containers-common Version: 1 -Release: 111%{?dist} +Release: 112%{?dist} Summary: Common configuration and documentation for containers License: ASL 2.0 ExclusiveArch: %{go_arches} @@ -87,8 +87,10 @@ install -dp %{buildroot}%{_datadir}/containers/systemd install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/storage.conf install -m0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/containers/registries.conf install -m0644 %{SOURCE17} %{buildroot}%{_sysconfdir}/containers/registries.conf.d/000-shortnames.conf -install -m0644 %{SOURCE19} %{buildroot}%{_sysconfdir}/containers/registries.conf.d/001-rhel-shortnames.conf -install -m0644 %{SOURCE20} %{buildroot}%{_sysconfdir}/containers/registries.conf.d/002-rhel-shortnames-overrides.conf +%if 0%{?fedora} == 0 && 0%{?centos} == 0 + install -m0644 %{SOURCE19} %{buildroot}%{_sysconfdir}/containers/registries.conf.d/001-rhel-shortnames.conf + install -m0644 %{SOURCE20} %{buildroot}%{_sysconfdir}/containers/registries.conf.d/002-rhel-shortnames-overrides.conf +%endif # for signature verification %if !0%{?rhel} || 0%{?centos} @@ -176,6 +178,10 @@ EOF %{_datadir}/rhel/secrets/* %changelog +* Tue Jan 28 2025 Jindrich Novy - 2:1-112 +- ship RHEL shortnames only in RHEL - thanks to Dennis Gilmore +- Related: RHEL-60277 + * Wed Jan 15 2025 Jindrich Novy - 2:1-111 - Add missing oci-hooks.5 man page - Related: RHEL-60277