rpm/podman
SHA256
1
0
Fork 0
forked from pool/podman
Code Pull Requests Activity

Accepting request 1095943 from devel:microos

Browse Source 
Don't unconditionally Obsolete podman-cni-config, ensure clean upgrade path (forwarded request 1095941 from danishprakash)

OBS-URL: https://build.opensuse.org/request/show/1095943
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/podman?expand=0&rev=108
This commit is contained in:
Dominique Leuenberger 2023-07-09 18:40:45 +00:00 committed by Git OBS Bridge
commit e3e7a1ef54
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
podman.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu Jun 29 09:19:01 UTC 2023 - Danish Prakash <danish.prakash@suse.com>
- Don't unconditionally Obsolete podman-cni-config, ensure clean upgrade path.
-------------------------------------------------------------------
Tue Jun 27 12:04:49 UTC 2023 - Danish Prakash <danish.prakash@suse.com>
- Prefer Podman's new network stack (netavark) exclusively on ALP
- Remove unused podman-cni-config subpackage, add systemd
-------------------------------------------------------------------
Mon May 29 10:56:00 UTC 2023 - danish.prakash@suse.com

30
podman.spec
View File

@ -28,7 +28,6 @@ Source0: %{name}-%{version}.tar.xz
Source1: podman.conf
Source2: README.SUSE.SLES
BuildRequires: bash-completion
BuildRequires: cni
BuildRequires: device-mapper-devel
BuildRequires: fdupes
BuildRequires: git-core
@ -41,16 +40,23 @@ BuildRequires: libassuan-devel
BuildRequires: libbtrfs-devel
BuildRequires: libcontainers-common
BuildRequires: libgpgme-devel
BuildRequires: libostree-devel
BuildRequires: libseccomp-devel
# at least go 1.18 is needed from go.mod
BuildRequires: golang(API) > 1.18
BuildRequires: pkgconfig(libselinux)
BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(systemd)
Recommends: apparmor-abstractions
Recommends: apparmor-parser
Requires: catatonit >= 0.1.7
# prefer Podman's new network stack on ALP
%if 0%{suse_version} >= 1600 && !0%{?is_opensuse}
Requires: netavark
%else
Requires: cni
Requires: cni-plugins
%endif
Requires: conmon >= 2.0.24
Requires: fuse-overlayfs
Requires: iptables
@ -58,9 +64,11 @@ Requires: libcontainers-common >= 20230214
Requires: runc >= 1.0.1
Requires: slirp4netns >= 0.4.0
Requires: timezone
Recommends: %{name}-cni-config = %{version}
Suggests: katacontainers
BuildRequires: libostree-devel
# deprecate unused podman-cni-config subpackage
Provides: %{name}-cni-config = %{version}
Obsoletes: %{name}-cni-config < 4.5.1
%description
@ -83,19 +91,6 @@ Provides: podman:%{_bindir}/%{name}-remote
%description remote
This client allows controlling podman on a separate host, e.g. over SSH.
%package cni-config
Summary: Basic CNI configuration for podman
Group: System/Management
Requires: %{name} = %{version}
# iproute2 is needed by the %%triggerun scriplet
Requires: iproute2
BuildArch: noarch
%description cni-config
A "basic" CNI configuration for podman that makes networking usable for basic
setups. In more complicated setups, users are recommended to write their own
CNI configurations.
%package docker
Summary: Emulate Docker CLI using podman
BuildArch: noarch
@ -194,9 +189,6 @@ install -D -m 0644 %{SOURCE2} %{buildroot}%{_docdir}/%{name}/README.SUSE
%dir %{_datadir}/fish/vendor_completions.d/
%{_datadir}/fish/vendor_completions.d/podman-remote.fish
%files cni-config
%license LICENSE
%files docker
%{_bindir}/docker
%{_tmpfilesdir}/podman-docker.conf