Accepting request 1124183 from home:Andreas_Schwab:Factory

- Use crun only on selected archs

OBS-URL: https://build.opensuse.org/request/show/1124183
OBS-URL: https://build.opensuse.org/package/show/devel:microos/podman?expand=0&rev=38
This commit is contained in:
Dan Čermák 2023-11-16 09:26:08 +00:00 committed by Git OBS Bridge
parent ae312e0a79
commit f7c25df87d
2 changed files with 15 additions and 10 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Nov 8 07:48:11 UTC 2023 - Andreas Schwab <schwab@suse.de>
- Use crun only on selected archs
-------------------------------------------------------------------
Wed Nov 01 07:15:17 UTC 2023 - dcermak@suse.com

View File

@ -15,6 +15,7 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%{!?_user_tmpfilesdir: %global _user_tmpfilesdir %{_datadir}/user-tmpfiles.d}
%define project github.com/containers/podman
Name: podman
@ -64,11 +65,11 @@ Requires: iptables
Requires: libcontainers-common >= 20230214
# use crun on Tumbleweed & ALP for WASM support
%if 0%{suse_version} >= 1600
%ifarch armv6l armv6hl
# crun not available for armv6 (because of criu)
Requires: runc >= 1.0.1
%else
# crun is only available for selected archs (because of criu)
%ifarch x86_64 aarch64 ppc64le armv7l armv7hl s390x
Requires: crun
%else
Requires: runc >= 1.0.1
%endif
%else
Requires: runc >= 1.0.1
@ -81,7 +82,6 @@ Suggests: katacontainers
Provides: %{name}-cni-config = %{version}
Obsoletes: %{name}-cni-config < 4.5.1
%description
Podman is a container engine for managing pods, containers, and container
images.
@ -94,7 +94,7 @@ skopeo, as they all share the same datastore backend.
%autosetup -p1
%package remote
Summary: Client for managing podman containers remotely
Summary: Client for managing podman containers remotely
Group: System/Management
Conflicts: %{name} < 3.1.2
Provides: podman:%{_bindir}/%{name}-remote
@ -119,10 +119,10 @@ executes podman commands, it also creates links between all Docker CLI man
pages and %{name}.
%package -n %{name}sh
Summary: Confined login and user shell using %{name}
Requires: %{name} = %{version}
Provides: %{name}-shell = %{version}
Provides: %{name}-%{name}sh = %{version}
Summary: Confined login and user shell using %{name}
Requires: %{name} = %{version}
Provides: %{name}-%{name}sh = %{version}
Provides: %{name}-shell = %{version}
%description -n %{name}sh
%{name}sh provides a confined login and user shell with access to volumes and