From 935db1ddc655b5b93c8717335d69b1d6eb4f2b80 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Mon, 15 Apr 2024 10:38:08 +0200 Subject: [PATCH] rebuilt with -mod=readonly and -modcacherw; install man-pages and autocompletion support [release 1.7.15-2mamba;Sun Apr 14 2024] --- README.md | 1 + containerd.spec | 27 ++++++++++++++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index fdb79f4..e59bc89 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # containerd A daemon to control OCI container runtimes. + diff --git a/containerd.spec b/containerd.spec index 5af9809..b0205b1 100644 --- a/containerd.spec +++ b/containerd.spec @@ -1,7 +1,6 @@ -%define _commit 09814d48d50816305a8e6c1a4ae3e2bcc4ba725a Name: containerd Version: 1.7.15 -Release: 1mamba +Release: 2mamba Summary: A daemon to control OCI container runtimes Group: System/Servers Vendor: openmamba @@ -19,7 +18,7 @@ BuildRequires: gcc-go %description A daemon to control OCI container runtimes. -#% debug_package +%debug_package %prep %setup -q @@ -32,12 +31,12 @@ sed -i 's,/sbin,/usr/bin,;s,/usr/local,/usr,' containerd.service %build export GOPATH=$PWD cd src/github.com/containerd/containerd -export GOFLAGS="-trimpath" +export GOFLAGS="-trimpath -mod=readonly -modcacherw" -# Required since Go 1.16 -export GO111MODULE=off +%make VERSION=v%{version} \ + GO_BUILD_FLAGS="${GOFLAGS}" GO_GCFLAGS="" EXTRA_LDFLAGS="-buildid=" -%make VERSION=v%{version}.m REVISION=%{_commit}.m +%make VERSION=v%{version} man %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -45,6 +44,11 @@ cd src/github.com/containerd/containerd %makeinstall DESTDIR=%{buildroot} PREFIX=%{_prefix} BINDIR=%{_bindir} install -Dm644 containerd.service %{buildroot}%{_unitdir}/containerd.service +install -Dm644 man/*.8 -t %{buildroot}%{_mandir}/man8 +install -Dm644 man/*.5 -t %{buildroot}%{_mandir}/man5 +install -Dm644 contrib/autocomplete/ctr %{buildroot}%{_datadir}/bash-completion/completions/ctr +install -Dm644 contrib/autocomplete/zsh_autocomplete %{buildroot}%{_datadir}/zsh/site-functions/_ctr + %post %systemd_post containerd : @@ -69,9 +73,18 @@ install -Dm644 containerd.service %{buildroot}%{_unitdir}/containerd.service %{_bindir}/containerd-stress %{_bindir}/ctr %{_unitdir}/containerd.service +%{_datadir}/bash-completion/completions/ctr +%{_datadir}/zsh/site-functions/_ctr +%{_mandir}/man5/containerd-config.toml.5* +%{_mandir}/man8/containerd-config.8* +%{_mandir}/man8/containerd.8* +%{_mandir}/man8/ctr.8* %doc LICENSE %changelog +* Sun Apr 14 2024 Silvan Calarco 1.7.15-2mamba +- rebuilt with -mod=readonly and -modcacherw; install man-pages and autocompletion support + * Sat Apr 06 2024 Automatic Build System 1.7.15-1mamba - automatic version update by autodist