diff --git a/podman.changes b/podman.changes index a776f47..5911589 100644 --- a/podman.changes +++ b/podman.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 27 12:04:49 UTC 2023 - Danish Prakash + +- 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 diff --git a/podman.spec b/podman.spec index 8c4a232..d41f5f7 100644 --- a/podman.spec +++ b/podman.spec @@ -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 +Obsoletes: %{name}-cni-config %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