diff --git a/containerd.spec b/containerd.spec index 11110288f6b5e09e3d545fd8a99a776a60efb1c4..20eefe6d1ccb6110a8b7c2dfcd2c5399cc4d8bbd 100644 --- a/containerd.spec +++ b/containerd.spec @@ -1,4 +1,4 @@ -%define anolis_release 3 +%define anolis_release 4 %bcond_without check @@ -15,9 +15,10 @@ Source1: containerd.service Source2: containerd.toml BuildRequires: btrfs-progs-devel systemd-rpm-macros go-md2man - Requires: runc +%gometa + %description Containerd is an industry-standard container runtime with an emphasis on simplicity, robustness and portability. It is available as a daemon for Linux @@ -25,9 +26,6 @@ and Windows, which can manage the complete container lifecycle of its host system: image transfer and storage, container execution and supervision, low-level storage and network attachments, etc. -%gometa -%gopkg - %package doc Summary: Documentation files for %{name} Requires: %{name} = %{version}-%{release} @@ -36,6 +34,8 @@ BuildArch: noarch %description doc The %{name}-doc package contains documentation files for %{name}. +%gopkg + %prep %goprep -k # Used only for generation: @@ -100,6 +100,9 @@ install -D -p -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/containerd/config.toml %doc code-of-conduct.md BUILDING.md %changelog +* Tue Apr 18 2023 yuanhui - 1.6.20-3 +- Fix the wrong placement for `%gometa` macro + * Tue Apr 18 2023 yuanhui - 1.6.20-3 - Remove Windows platform releated patches