Depend on container-network-stack and switch to autospec

This change will also recommend netavark.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
This commit is contained in:
Lokesh Mandvekar 2022-01-24 15:29:22 -05:00
parent c1bf721fcb
commit 8f21e603b4

View File

@ -16,7 +16,7 @@
Epoch: 4 Epoch: 4
Name: containers-common Name: containers-common
Version: 1 Version: 1
Release: 38%{?dist} Release: %autorelease
Summary: Common configuration and documentation for containers Summary: Common configuration and documentation for containers
License: ASL 2.0 License: ASL 2.0
BuildArch: noarch BuildArch: noarch
@ -24,6 +24,8 @@ BuildRequires: go-md2man
Provides: skopeo-containers = %{epoch}:%{version}-%{release} Provides: skopeo-containers = %{epoch}:%{version}-%{release}
Requires: (container-selinux >= 2:2.162.1 if selinux-policy) Requires: (container-selinux >= 2:2.162.1 if selinux-policy)
Requires: oci-runtime Requires: oci-runtime
Requires: container-network-stack
Recommends: netavark
Recommends: fuse-overlayfs Recommends: fuse-overlayfs
Recommends: slirp4netns Recommends: slirp4netns
Source1: %{github_containers}/common/%{common_branch}/docs/containers.conf.5.md Source1: %{github_containers}/common/%{common_branch}/docs/containers.conf.5.md
@ -162,127 +164,4 @@ ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secret
%{_datadir}/rhel/secrets/* %{_datadir}/rhel/secrets/*
%changelog %changelog
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4:1-38 %autochangelog
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Mon Dec 20 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-37
- Update to grab latest man pages and configuration files
* Mon Nov 29 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-36
- Update to grab latest man pages and configuration files
- Move /etc/containers/containers.conf to /usr/share/containers/containers.conf
* Mon Nov 8 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-35
- Update to grab latest man pages and configuration files
* Thu Oct 21 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-34
- Update to grab latest man pages and configuration files
* Fri Oct 1 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-33
- Update to grab latest man pages and configuration files
* Fri Oct 1 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-31
- Update to grab latest man pages and configuration files
- Add Containerfile.md
- Add containerignore.md
* Sun Sep 26 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-30
- Update to grab latest man pages and configuration files
- Add containerfile.md
* Mon Sep 20 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-29
- Update to grab latest man pages and configuration files
* Tue Sep 14 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-28
- Update to grab latest man pages and configuration files
* Wed Sep 8 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-27
- Update to grab latest man pages and configuration files
* Wed Aug 25 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-26
- Add memfd_secret to seccomp.json
* Thu Aug 12 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-25
- Update to grab latest man pages and configuration files
* Mon Jul 26 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-24
- Add support for signed RHEL images, enabled by default
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4:1-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Thu Jul 15 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-22
- Update to grab latest man pages and configuration files, also switch to using some main rather then master branches
* Tue Jun 29 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-21
- fetch latest upstream configs
* Thu Jun 10 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-20
- 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
* Tue May 11 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-18
- Update containers.conf to latest, and change default log-driver to journald.
* Thu Apr 15 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-17
- add common dependencies like oci-runtime and container-selinux
- will pull in crun by default, runc users should install runc separately first
or explicitly require runc
* Mon Apr 12 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-16
- use latest configs from upstream
* Fri Apr 09 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-15
- pull latest files from upstream
* Fri Mar 19 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-14
- also provide skopeo-containers
- bump release tag for smooth upgrade from f34
- use latest upstream files
* Thu Feb 18 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-10
- install shortnames.conf as 000-shrotnames.conf
* Mon Feb 15 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-9
- Remove registry.centos.org and add quay.io from registries.conf
* Mon Feb 15 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-8
- Update content
* Mon Feb 01 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-7
- use the correct policy.json file
* Thu Jan 28 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-6
- short-name-mode="enforcing" in registries.conf
* Thu Jan 28 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-5
- number sources in order
* Thu Jan 28 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-4
- Resolves: #1916922 - do not depend on subscription-manager
- reorder sources in alphabetical order
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4:1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jan 20 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-2
- bump version to random number
- no connection of package to github.com/containers/common
- add conf files to dist-git repo
- bring back update.sh
* Wed Jan 13 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:0.33.0-3
- copy source files into builddir and change them there before installation
* Tue Jan 12 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:0.33.0-2
- move update.sh code to spec file itself
* Tue Jan 12 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:0.33.0-1
- update registries.conf and other files
- source urls in update.sh
* Tue Dec 08 2020 Jindrich Novy <jnovy@redhat.com> - 3:1-1
- initial build