diff --git a/containers-common.spec b/containers-common.spec index cb2cfaf..6d06d69 100644 --- a/containers-common.spec +++ b/containers-common.spec @@ -22,12 +22,11 @@ BuildArch: noarch Summary: Common configuration and documentation for containers BuildRequires: go-md2man Provides: skopeo-containers = %{epoch}:%{version}-%{release} -Requires: slirp4netns -Recommends: fuse-overlayfs Requires: (container-selinux >= 2:2.162.1 if selinux-policy) -Requires: oci-runtime -Requires: container-network-stack -Recommends: netavark +Recommends: fuse-overlayfs +Requires: (fuse-overlayfs if fedora-release-identity-server) +# SourceN files fetched from upstream +# GPG key and registry configs taken from RH Source1: %{github_containers}/common/%{common_branch}/docs/containers.conf.5.md Source2: %{github_containers}/common/%{common_branch}/pkg/config/containers.conf Source3: %{github_containers}/common/%{common_branch}/pkg/seccomp/seccomp.json @@ -54,7 +53,6 @@ Source23: %{github_containers}/common/%{common_branch}/docs/Containerfile.5.md Source24: %{github_containers}/common/%{common_branch}/docs/containerignore.5.md Source25: %{github_containers}/common/%{common_branch}/docs/links/.containerignore.5 - %description This package contains common configuration files and documentation for container tools ecosystem, such as Podman, Buildah and Skopeo. @@ -63,6 +61,22 @@ It is required because the most of configuration files and docs come from projec which are vendored into Podman, Buildah, Skopeo, etc. but they are not packaged separately. +%package extra +Summary: Extra dependencies for Podman and Buildah +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: container-network-stack +Requires: oci-runtime +Recommends: crun +Requires: (crun if fedora-release-identity-server) +Recommends: netavark +Requires: (netavark if fedora-release-identity-server) +Recommends: slirp4netns +Requires: (slirp4netns if fedora-release-identity-server) + +%description extra +This subpackage will handle dependencies common to Podman and Buildah which are +not required by Skopeo. + %prep cp %{SOURCE1} . cp %{SOURCE2} . @@ -162,5 +176,7 @@ ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secret %dir %{_datadir}/rhel/secrets %{_datadir}/rhel/secrets/* +%files extra + %changelog %autochangelog