rpms/containers-common
6
0
Fork 0
Code Issues Pull Requests Releases Activity

containers-common-0.61.0-3.el10

Browse Source 
- ship RHEL shortnames only in RHEL (thanks to Dennis Gilmore)
- Resolves: RHEL-75943

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
This commit is contained in:
Jindrich Novy 2025-01-28 10:00:23 +01:00
parent 2ea434e226
commit ad3a2f2863
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
containers-common.spec
View File

@ -17,7 +17,7 @@
Name: containers-common Name: containers-common
Epoch: 5 Epoch: 5
Version: %{common_version} Version: %{common_version}
Release: 2%{?dist} Release: 3%{?dist}
License: Apache-2.0 License: Apache-2.0
BuildArch: noarch BuildArch: noarch
# for BuildRequires: go-md2man # for BuildRequires: go-md2man
@ -108,8 +108,10 @@ touch %{buildroot}%{_prefix}/lib/containers/storage/overlay-layers/layers.lock
install -m0644 %{SOURCE1} %{buildroot}%{_datadir}/containers/storage.conf install -m0644 %{SOURCE1} %{buildroot}%{_datadir}/containers/storage.conf
install -m0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/containers/registries.conf install -m0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/containers/registries.conf
install -m0644 %{SOURCE17} %{buildroot}%{_sysconfdir}/containers/registries.conf.d/000-shortnames.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 %if 0%{?fedora} == 0 && 0%{?centos} == 0
install -m0644 %{SOURCE20} %{buildroot}%{_sysconfdir}/containers/registries.conf.d/002-rhel-shortnames-overrides.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
%endif
install -dp %{buildroot}%{_sysconfdir}/containers/registries.d install -dp %{buildroot}%{_sysconfdir}/containers/registries.d
install -m0644 %{SOURCE22} %{buildroot}%{_sysconfdir}/containers/registries.d install -m0644 %{SOURCE22} %{buildroot}%{_sysconfdir}/containers/registries.d
@ -198,6 +200,10 @@ ln -s ../../../..%{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/
%files extra %files extra
%changelog %changelog
* Tue Jan 28 2025 Jindrich Novy <jnovy@redhat.com> - 5:0.61.0-3
- ship RHEL shortnames only in RHEL (thanks to Dennis Gilmore)
- Resolves: RHEL-75943
* Wed Jan 15 2025 Jindrich Novy <jnovy@redhat.com> - 5:0.61.0-2 * Wed Jan 15 2025 Jindrich Novy <jnovy@redhat.com> - 5:0.61.0-2
- Add missing oci-hooks.5 man page - Add missing oci-hooks.5 man page
- Related: RHEL-58990 - Related: RHEL-58990