Accepting request 1132878 from home:favogt:branches:devel:microos

- Refactor network backend dependencies:
  * podman requires either netavark or cni-plugins. On ALP, require
    netavark, otherwise prefer netavark but don't force it.
  * This fixes missing cni-plugins in some scenarios
  * Default to netavark everywhere where it's available

OBS-URL: https://build.opensuse.org/request/show/1132878
OBS-URL: https://build.opensuse.org/package/show/devel:microos/podman?expand=0&rev=43

podman.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Dec 13 12:51:44 UTC 2023 - Fabian Vogt <fvogt@suse.com>
+
+- Refactor network backend dependencies:
+  * podman requires either netavark or cni-plugins. On ALP, require
+    netavark, otherwise prefer netavark but don't force it.
+  * This fixes missing cni-plugins in some scenarios
+  * Default to netavark everywhere where it's available
+
 -------------------------------------------------------------------
 Mon Dec 11 16:13:48 UTC 2023 - kastl@b1-systems.de
 

podman.spec

@@ -52,20 +52,14 @@ Recommends:     apparmor-parser
 # requirement for `podman machine`
 Recommends:     gvisor-tap-vsock
 Requires:       catatonit >= 0.1.7
-# provide both cni and netavark on TW
-# but "prefer" netavark especially for
-# fresh installations (bsc#1217828)
-%if 0%{?suse_version} > 1600
-Requires:       (netavark or cni)
-Suggests:       netavark
-%else
-# default to Netavark on ALP
+# Needs a network backend
+Requires:       (netavark or cni-plugins)
+# Force netavark on ALP
 %if 0%{suse_version} >= 1600 && !0%{?is_opensuse}
 Requires:       netavark
 %else
-Requires:       cni
-Requires:       cni-plugins
-%endif
+# Prefer netavark for fresh installations (bsc#1217828)
+Suggests:       netavark
 %endif
 Requires:       conmon >= 2.0.24
 Requires:       fuse-overlayfs