rpms/containers-common
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'rawhide' of ssh://pkgs.fedoraproject.org/rpms/containers-common into rawhide

Browse Source
This commit is contained in:
Daniel J Walsh 2021-06-10 08:51:41 -04:00
commit d09b5a13b3
No known key found for this signature in database
GPG Key ID: A2DF901DABE2C028
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
containers-common.spec
View File

@ -21,7 +21,7 @@ License: ASL 2.0
BuildArch: noarch BuildArch: noarch
BuildRequires: go-md2man BuildRequires: go-md2man
Provides: skopeo-containers = %{epoch}:%{version}-%{release} 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 Requires: oci-runtime
Recommends: fuse-overlayfs Recommends: fuse-overlayfs
Recommends: slirp4netns Recommends: slirp4netns
@ -136,8 +136,13 @@ ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secret
%{_datadir}/rhel/secrets/* %{_datadir}/rhel/secrets/*
%changelog %changelog
<<<<<<< HEAD
* Thu Jun 10 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-19 * Thu Jun 10 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-19
- Update to grab latest man pages and configuration files, also switch to using some main rather then master branches - 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 <lsm5@fedoraproject.org> - 4:1-19
- use container-selinux 2.162.1 and use latest configs
>>>>>>> 0f389750defb05318144c76645808719db79b246
* Tue May 11 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-18 * Tue May 11 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-18
- Update containers.conf to latest, and change default log-driver to journald. - Update containers.conf to latest, and change default log-driver to journald.