From 4dc9c96670c51f4ad3f19b73a019b1fb553f1c3f Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 4 Dec 2024 09:45:32 +0300 Subject: [PATCH] import podman-5.3.1-3.el10 --- SPECS/podman.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/SPECS/podman.spec b/SPECS/podman.spec index 1212fe8..359a860 100644 --- a/SPECS/podman.spec +++ b/SPECS/podman.spec @@ -60,7 +60,7 @@ Epoch: 6 Version: 5.3.1 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 -Release: 2%{?dist} +Release: 3%{?dist} %if %{defined golang_arches_future} ExclusiveArch: %{golang_arches_future} %else @@ -189,17 +189,18 @@ capabilities specified in user quadlets. It is a symlink to %{_bindir}/%{name} and execs into the `%{name}sh` container when `%{_bindir}/%{name}sh` is set as a login shell or set as os.Args[0]. +%ifarch x86_64 aarch64 %package machine Summary: Metapackage for setting up %{name} machine Requires: %{name} = %{epoch}:%{version}-%{release} Requires: gvisor-tap-vsock Recommends: qemu Requires: virtiofsd -ExclusiveArch: x86_64 aarch64 %description machine This subpackage installs the dependencies for %{name} machine, for more see: https://docs.podman.io/en/latest/markdown/podman-machine.1.html +%endif %prep %if 0%{?branch:1} @@ -297,8 +298,10 @@ rm -f %{buildroot}%{_mandir}/man5/docker*.5 install -d -p %{buildroot}%{_datadir}/%{name}/test/system cp -pav test/system %{buildroot}%{_datadir}/%{name}/test/ +%ifarch x86_64 aarch64 # symlink virtiofsd in %%{name} libexecdir for machine subpackage ln -s ../virtiofsd %{buildroot}%{_libexecdir}/%{name} +%endif #define license tag if not already defined %{!?_licensedir:%global license %doc} @@ -350,11 +353,17 @@ ln -s ../virtiofsd %{buildroot}%{_libexecdir}/%{name} %{_bindir}/%{name}sh %{_mandir}/man1/%{name}sh.1* +%ifarch x86_64 aarch64 %files machine %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/virtiofsd +%endif %changelog +* Mon Dec 02 2024 Jindrich Novy - 6:5.3.1-3 +- Do not use ExcludeArch for machine but ifarch conditionals +- Resolves: RHEL-69441 + * Thu Nov 28 2024 Jindrich Novy - 6:5.3.1-2 - Reduce arches for podman-machine to x86_64 aarch64 - Resolves: RHEL-69441