diff --git a/containers-common.spec b/containers-common.spec index a6cddd3..32af23e 100644 --- a/containers-common.spec +++ b/containers-common.spec @@ -21,7 +21,7 @@ License: ASL 2.0 BuildArch: noarch BuildRequires: go-md2man Provides: skopeo-containers = %{epoch}:%{version}-%{release} -Requires: (container-selinux >= 2:2.160.0 if selinux-policy) +Requires: (container-selinux >= 2:2.162.1 if selinux-policy) Requires: oci-runtime Recommends: fuse-overlayfs Recommends: slirp4netns @@ -136,8 +136,13 @@ ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secret %{_datadir}/rhel/secrets/* %changelog +<<<<<<< HEAD * Thu Jun 10 2021 Dan Walsh - 4:1-19 - Update to grab latest man pages and configuration files, also switch to using some main rather then master branches +======= +* Tue May 18 2021 Lokesh Mandvekar - 4:1-19 +- use container-selinux 2.162.1 and use latest configs +>>>>>>> 0f389750defb05318144c76645808719db79b246 * Tue May 11 2021 Dan Walsh - 4:1-18 - Update containers.conf to latest, and change default log-driver to journald.