Merge pull request #28899 from Luap99/rpm

rpm: require specific containers-common with new config files

Author: mheon

rpm/podman.spec

@@ -100,14 +100,8 @@ BuildRequires: systemd
 BuildRequires: systemd-devel
 Requires: catatonit
 Requires: conmon >= 2:2.1.7-2
-%if %{defined fedora} && 0%{?fedora} >= 40
-# TODO: Remove the f40 conditional after a few releases to keep conditionals to
-# a minimum
-# Ref: https://bugzilla.redhat.com/show_bug.cgi?id=2269148
-Requires: containers-common-extra >= 5:0.58.0-1
-%else
-Requires: containers-common-extra
-%endif
+# Podman 6 requires the new config file layout.
+Requires: containers-common-extra >= 5:0.68.0
 %if %{defined sequoia}
 Requires: podman-sequoia
 %endif