rpms/podman
6
0
Fork 0
Code Issues Pull Requests Releases Activity

podman-5.3.1-3.el10

Browse Source 
- Do not use ExcludeArch for machine but ifarch conditionals
- Resolves: RHEL-69441

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
This commit is contained in:
Jindrich Novy 2024-12-02 11:50:23 +01:00
parent 81177f05a1
commit 3985853858
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
podman.spec
View File

@ -60,7 +60,7 @@ Epoch: 6
Version: 5.3.1 Version: 5.3.1
# The `AND` needs to be uppercase in the License for SPDX compatibility # 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 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} %if %{defined golang_arches_future}
ExclusiveArch: %{golang_arches_future} ExclusiveArch: %{golang_arches_future}
%else %else
@ -189,17 +189,18 @@ capabilities specified in user quadlets.
It is a symlink to %{_bindir}/%{name} and execs into the `%{name}sh` container 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]. when `%{_bindir}/%{name}sh` is set as a login shell or set as os.Args[0].
%ifarch x86_64 aarch64
%package machine %package machine
Summary: Metapackage for setting up %{name} machine Summary: Metapackage for setting up %{name} machine
Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: gvisor-tap-vsock Requires: gvisor-tap-vsock
Recommends: qemu Recommends: qemu
Requires: virtiofsd Requires: virtiofsd
ExclusiveArch: x86_64 aarch64
%description machine %description machine
This subpackage installs the dependencies for %{name} machine, for more see: This subpackage installs the dependencies for %{name} machine, for more see:
https://docs.podman.io/en/latest/markdown/podman-machine.1.html https://docs.podman.io/en/latest/markdown/podman-machine.1.html
%endif
%prep %prep
%if 0%{?branch:1} %if 0%{?branch:1}
@ -297,8 +298,10 @@ rm -f %{buildroot}%{_mandir}/man5/docker*.5
install -d -p %{buildroot}%{_datadir}/%{name}/test/system install -d -p %{buildroot}%{_datadir}/%{name}/test/system
cp -pav test/system %{buildroot}%{_datadir}/%{name}/test/ cp -pav test/system %{buildroot}%{_datadir}/%{name}/test/
%ifarch x86_64 aarch64
# symlink virtiofsd in %%{name} libexecdir for machine subpackage # symlink virtiofsd in %%{name} libexecdir for machine subpackage
ln -s ../virtiofsd %{buildroot}%{_libexecdir}/%{name} ln -s ../virtiofsd %{buildroot}%{_libexecdir}/%{name}
%endif
#define license tag if not already defined #define license tag if not already defined
%{!?_licensedir:%global license %doc} %{!?_licensedir:%global license %doc}
@ -350,11 +353,17 @@ ln -s ../virtiofsd %{buildroot}%{_libexecdir}/%{name}
%{_bindir}/%{name}sh %{_bindir}/%{name}sh
%{_mandir}/man1/%{name}sh.1* %{_mandir}/man1/%{name}sh.1*
%ifarch x86_64 aarch64
%files machine %files machine
%dir %{_libexecdir}/%{name} %dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/virtiofsd %{_libexecdir}/%{name}/virtiofsd
%endif
%changelog %changelog
* Mon Dec 02 2024 Jindrich Novy <jnovy@redhat.com> - 6:5.3.1-3
- Do not use ExcludeArch for machine but ifarch conditionals
- Resolves: RHEL-69441
* Thu Nov 28 2024 Jindrich Novy <jnovy@redhat.com> - 6:5.3.1-2 * Thu Nov 28 2024 Jindrich Novy <jnovy@redhat.com> - 6:5.3.1-2
- Reduce arches for podman-machine to x86_64 aarch64 - Reduce arches for podman-machine to x86_64 aarch64
- Resolves: RHEL-69441 - Resolves: RHEL-69441