The package rpms/containerd.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/containerd.git/commit/?id=6aec4fc...
https://src.fedoraproject.org/cgit/rpms/containerd.git/commit/?id=cd27dee...
https://src.fedoraproject.org/cgit/rpms/containerd.git/commit/?id=56f6890....
Change:
+%ifnarch ppc64
+ExclusiveArch: %{go_arches}
-ExclusiveArch: %{go_arches}
Thanks.
Full change:
============
commit 6aec4fc813a77bf85e94e7fcdbc4541b54ea0223
Author: Carl George <carl(a)george.computer>
Date: Thu Jan 3 23:13:00 2019 -0600
Add fallback macros for EPEL
diff --git a/containerd.spec b/containerd.spec
index 8b45e9b..9b02054 100644
--- a/containerd.spec
+++ b/containerd.spec
@@ -1,7 +1,31 @@
%global goipath
github.com/containerd/containerd
Version: 1.2.1
+
+%if %{defined fedora}
%gometa
%bcond_without tests
+%else
+ExclusiveArch: %{go_arches}
+%global debug_package %{nil}
+%global gosource https://%{goipath}/archive/v%{version}/containerd-%{version}.tar.gz
+%define gobuildroot %{expand:
+GO_BUILD_PATH=$PWD/_build
+install -m 0755 -vd $(dirname $GO_BUILD_PATH/src/%{goipath})
+ln -fs $PWD $GO_BUILD_PATH/src/%{goipath}
+cd $GO_BUILD_PATH/src/%{goipath}
+install -m 0755 -vd _bin
+export PATH=$PWD/_bin${PATH:+:$PATH}
+export GOPATH=$GO_BUILD_PATH:%{gopath}
+}
+%define gobuild(o:) %{expand:
+%global _dwz_low_mem_die_limit 0
+%ifnarch ppc64
+go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}"
-ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d '
\\n') -extldflags '%__global_ldflags %{?__golang_extldflags}'" -a -v -x
%{?**};
+%else
+go build -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags
"${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')
-extldflags '%__global_ldflags %{?__golang_extldflags}'" -a -v -x %{?**};
+%endif
+}
+%endif
Name: containerd
commit 160facb7bb1079662864f43278326fa79fb1d145
Author: Carl George <carl(a)george.computer>
Date: Thu Jan 3 23:10:00 2019 -0600
Run test suite
diff --git a/containerd.spec b/containerd.spec
index e003c2a..8b45e9b 100644
--- a/containerd.spec
+++ b/containerd.spec
@@ -1,6 +1,7 @@
%global goipath
github.com/containerd/containerd
Version: 1.2.1
%gometa
+%bcond_without tests
Name: containerd
@@ -143,6 +144,12 @@ install -D -p -m 0644 %{S:1}
%{buildroot}%{_unitdir}/containerd.service
install -D -p -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/containerd/config.toml
+%if %{with tests}
+%check
+%gochecks
+%endif
+
+
%post
%systemd_post containerd.service
@@ -173,6 +180,7 @@ install -D -p -m 0644 %{S:2}
%{buildroot}%{_sysconfdir}/containerd/config.toml
%changelog
* Thu Jan 03 2019 Carl George <carl(a)george.computer> - 1.2.1-1
- Latest upstream
+- Run test suite
* Thu Oct 25 2018 Carl George <carl(a)george.computer> - 1.2.0-1
- Latest upstream
commit 56f68903eb225e10bf9fa5a16c2c069615c745cc
Author: Carl George <carl(a)george.computer>
Date: Thu Jan 3 23:09:11 2019 -0600
Switch to new go macros
diff --git a/containerd.spec b/containerd.spec
index 3719557..e003c2a 100644
--- a/containerd.spec
+++ b/containerd.spec
@@ -1,29 +1,17 @@
-%bcond_with debug
-
-%if %{with debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
-%if ! 0%{?gobuild:1}
-%define gobuild(o:) go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od
-An -tx1|tr -d ' \\n')" -a -v -x %{?**};
-%endif
+%global goipath
github.com/containerd/containerd
+Version: 1.2.1
+%gometa
-%global import_path
github.com/containerd/containerd
Name: containerd
-Version: 1.2.1
Release: 1%{?dist}
Summary: An industry-standard container runtime
License: ASL 2.0
URL:
https://containerd.io
-Source0: https://%{import_path}/archive/v%{version}/containerd-%{version}.tar.gz
+Source0: %{gosource}
Source1: containerd.service
Source2: containerd.toml
-ExclusiveArch: %{go_arches}
-%{?go_compiler:BuildRequires: compiler(go-compiler)}
BuildRequires: golang >= 1.10
BuildRequires: btrfs-progs-devel
BuildRequires: go-md2man
@@ -131,28 +119,26 @@ low-level storage and network attachments, etc.
%build
-mkdir -p src/%(dirname %{import_path})
-ln -s ../../.. src/%{import_path}
-export GOPATH=$(pwd):%{gopath}
-export LDFLAGS="-X %{import_path}/version.Version=%{version}"
-%gobuild -o bin/containerd %{import_path}/cmd/containerd
-%gobuild -o bin/containerd-shim %{import_path}/cmd/containerd-shim
-%gobuild -o bin/ctr %{import_path}/cmd/ctr
-mkdir man
-go-md2man -in docs/man/containerd.1.md -out man/containerd.1
-go-md2man -in docs/man/containerd-config.1.md -out man/containerd-config.1
-go-md2man -in docs/man/ctr.1.md -out man/ctr.1
-go-md2man -in docs/man/containerd-config.toml.5.md -out man/containerd-config.toml.5
+%gobuildroot
+export LDFLAGS="-X %{goipath}/version.Version=%{version}"
+%gobuild -o _bin/containerd %{goipath}/cmd/containerd
+%gobuild -o _bin/containerd-shim %{goipath}/cmd/containerd-shim
+%gobuild -o _bin/ctr %{goipath}/cmd/ctr
+mkdir _man
+go-md2man -in docs/man/containerd.1.md -out _man/containerd.1
+go-md2man -in docs/man/containerd-config.1.md -out _man/containerd-config.1
+go-md2man -in docs/man/ctr.1.md -out _man/ctr.1
+go-md2man -in docs/man/containerd-config.toml.5.md -out _man/containerd-config.toml.5
%install
-install -D -p -m 0755 bin/containerd %{buildroot}%{_bindir}/containerd
-install -D -p -m 0755 bin/containerd-shim %{buildroot}%{_bindir}/containerd-shim
-install -D -p -m 0755 bin/ctr %{buildroot}%{_bindir}/ctr
-install -D -p -m 0644 man/containerd.1 %{buildroot}%{_mandir}/man1/containerd.1
-install -D -p -m 0644 man/containerd-config.1
%{buildroot}%{_mandir}/man1/containerd-config.1
-install -D -p -m 0644 man/ctr.1 %{buildroot}%{_mandir}/man1/ctr.1
-install -D -p -m 0644 man/containerd-config.toml.5
%{buildroot}%{_mandir}/man5/containerd-config.toml.5
+install -D -p -m 0755 _bin/containerd %{buildroot}%{_bindir}/containerd
+install -D -p -m 0755 _bin/containerd-shim %{buildroot}%{_bindir}/containerd-shim
+install -D -p -m 0755 _bin/ctr %{buildroot}%{_bindir}/ctr
+install -D -p -m 0644 _man/containerd.1 %{buildroot}%{_mandir}/man1/containerd.1
+install -D -p -m 0644 _man/containerd-config.1
%{buildroot}%{_mandir}/man1/containerd-config.1
+install -D -p -m 0644 _man/ctr.1 %{buildroot}%{_mandir}/man1/ctr.1
+install -D -p -m 0644 _man/containerd-config.toml.5
%{buildroot}%{_mandir}/man5/containerd-config.toml.5
install -D -p -m 0644 %{S:1} %{buildroot}%{_unitdir}/containerd.service
install -D -p -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/containerd/config.toml
commit de1fd6f804d67076c465ec892a33e7bc80d861e6
Author: Carl George <carl(a)george.computer>
Date: Thu Jan 3 22:50:14 2019 -0600
Preserve timestamps during %install
https://docs.fedoraproject.org/en-US/packaging-guidelines/#_timestamps
diff --git a/containerd.spec b/containerd.spec
index 16b313e..3719557 100644
--- a/containerd.spec
+++ b/containerd.spec
@@ -146,15 +146,15 @@ go-md2man -in docs/man/containerd-config.toml.5.md -out
man/containerd-config.to
%install
-install -D -m 0755 bin/containerd %{buildroot}%{_bindir}/containerd
-install -D -m 0755 bin/containerd-shim %{buildroot}%{_bindir}/containerd-shim
-install -D -m 0755 bin/ctr %{buildroot}%{_bindir}/ctr
-install -D -m 0644 man/containerd.1 %{buildroot}%{_mandir}/man1/containerd.1
-install -D -m 0644 man/containerd-config.1
%{buildroot}%{_mandir}/man1/containerd-config.1
-install -D -m 0644 man/ctr.1 %{buildroot}%{_mandir}/man1/ctr.1
-install -D -m 0644 man/containerd-config.toml.5
%{buildroot}%{_mandir}/man5/containerd-config.toml.5
-install -D -m 0644 %{S:1} %{buildroot}%{_unitdir}/containerd.service
-install -D -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/containerd/config.toml
+install -D -p -m 0755 bin/containerd %{buildroot}%{_bindir}/containerd
+install -D -p -m 0755 bin/containerd-shim %{buildroot}%{_bindir}/containerd-shim
+install -D -p -m 0755 bin/ctr %{buildroot}%{_bindir}/ctr
+install -D -p -m 0644 man/containerd.1 %{buildroot}%{_mandir}/man1/containerd.1
+install -D -p -m 0644 man/containerd-config.1
%{buildroot}%{_mandir}/man1/containerd-config.1
+install -D -p -m 0644 man/ctr.1 %{buildroot}%{_mandir}/man1/ctr.1
+install -D -p -m 0644 man/containerd-config.toml.5
%{buildroot}%{_mandir}/man5/containerd-config.toml.5
+install -D -p -m 0644 %{S:1} %{buildroot}%{_unitdir}/containerd.service
+install -D -p -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/containerd/config.toml
%post
commit cd27deee2efc2dee7e6a09f1af9c7095bdabda11
Author: Carl George <carl(a)george.computer>
Date: Thu Jan 3 22:48:34 2019 -0600
Latest upstream 1.2.1
diff --git a/containerd.spec b/containerd.spec
index 7c96257..16b313e 100644
--- a/containerd.spec
+++ b/containerd.spec
@@ -12,96 +12,137 @@
%global import_path
github.com/containerd/containerd
-Name: containerd
-Version: 1.2.0
-%global commit 773c489c9c1b21a6d78b5c538cd395416ec50f88
-%global tag v%{version}
-Release: 1%{?dist}
-Summary: An industry-standard container runtime
-License: ASL 2.0
-URL:
https://containerd.io
-Source0: https://%{import_path}/archive/%{tag}/containerd-%{version}.tar.gz
-Source1: containerd.service
-Source2: containerd.toml
-ExclusiveArch: %{go_arches}
-BuildRequires: systemd
+Name: containerd
+Version: 1.2.1
+Release: 1%{?dist}
+Summary: An industry-standard container runtime
+License: ASL 2.0
+URL:
https://containerd.io
+Source0: https://%{import_path}/archive/v%{version}/containerd-%{version}.tar.gz
+Source1: containerd.service
+Source2: containerd.toml
+ExclusiveArch: %{go_arches}
+
%{?go_compiler:BuildRequires: compiler(go-compiler)}
-BuildRequires: golang >= 1.10
-BuildRequires: protobuf-compiler
-BuildRequires: pkgconfig(protobuf) >= 3
-BuildRequires: btrfs-progs-devel
-BuildRequires: go-md2man
+BuildRequires: golang >= 1.10
+BuildRequires: btrfs-progs-devel
+BuildRequires: go-md2man
+BuildRequires: systemd
%{?systemd_requires}
-#
https://github.com/containerd/containerd/issues/1508#issuecomment-335566293
-Requires: runc >= 1.0.0
+Requires: runc
+
# vendored libraries
-# grep -v -e '^$' -e '^#' containerd-*/vendor.conf | awk '{print
"Provides: bundled(golang("$1")) = "$2}' | sort
-Provides:
bundled(golang(github.com/containerd/aufs)) =
ffa39970e26ad01d81f540b21e65f9c1841a5f92
-Provides:
bundled(golang(github.com/containerd/cgroups)) =
5e610833b72089b37d0e615de9a92dfc043757c2
-Provides:
bundled(golang(github.com/containerd/console)) =
c12b1e7919c14469339a5d38f2f8ed9b64a9de23
-Provides:
bundled(golang(github.com/containerd/continuity)) =
bd77b46c8352f74eb12c85bdc01f4b90f69d66b4
-Provides:
bundled(golang(github.com/containerd/cri)) =
f913714917d2456d7e65a0be84962b1ce8acb487
-Provides:
bundled(golang(github.com/containerd/go-cni)) =
40bcf8ec8acd7372be1d77031d585d5d8e561c90
-Provides:
bundled(golang(github.com/containerd/go-runc)) =
5a6d9f37cfa36b15efba46dc7ea349fa9b7143c3
-Provides:
bundled(golang(github.com/containerd/ttrpc)) =
2a805f71863501300ae1976d29f0454ae003e85a
-Provides:
bundled(golang(github.com/containerd/typeurl)) =
a93fcdb778cd272c6e9b3028b2f42d813e785d40
-Provides:
bundled(golang(github.com/emicklei/go-restful)) = 2.2.1
-Provides:
bundled(golang(github.com/ghodss/yaml)) = 1.0.0
-Provides:
bundled(golang(github.com/golang/protobuf)) = 1.1.0
-Provides:
bundled(golang(github.com/json-iterator/go)) = 1.1.5
-Provides:
bundled(golang(github.com/Microsoft/go-winio)) = 0.4.11
-Provides:
bundled(golang(github.com/Microsoft/hcsshim)) = 0.7.12
-Provides:
bundled(golang(github.com/modern-go/concurrent)) = 1.0.3
-Provides:
bundled(golang(github.com/modern-go/reflect2)) = 1.0.1
-Provides:
bundled(golang(github.com/opencontainers/go-digest)) =
c9281466c8b2f606084ac71339773efd177436e7
-Provides:
bundled(golang(github.com/opencontainers/runc)) =
58592df56734acf62e574865fe40b9e53e967910
-Provides:
bundled(golang(github.com/opencontainers/runtime-spec)) =
eba862dc2470385a233c7507392675cbeadf7353
-Provides:
bundled(golang(github.com/opencontainers/runtime-tools)) = 0.6.0
-Provides:
bundled(golang(github.com/opencontainers/selinux)) =
b6fa367ed7f534f9ba25391cc2d467085dbb445a
-Provides:
bundled(golang(github.com/tchap/go-patricia)) = 2.2.6
-Provides:
bundled(golang(github.com/xeipuuv/gojsonpointer)) =
4e3ac2762d5f479393488629ee9370b50873b3a6
-Provides:
bundled(golang(github.com/xeipuuv/gojsonreference)) =
bd5ef7bd5415a7ac448318e64f11a24cd21e594b
-Provides:
bundled(golang(github.com/xeipuuv/gojsonschema)) =
1d523034197ff1f222f6429836dd36a2457a1874
-Provides: bundled(golang(go.etcd.io/bbolt)) = 1.3.1-etcd.8
-Provides:
bundled(golang(golang.org/x/net)) = b3756b4b77d7b13260a0a2ec658753cf48922eac
-Provides:
bundled(golang(golang.org/x/oauth2)) =
a6bd8cefa1811bd24b86f8902872e4e8225f74c4
-Provides:
bundled(golang(golang.org/x/sys)) = 1b2967e3c290b7c545b3db0deeda16e9be4f98a2
-Provides:
bundled(golang(google.golang.org/grpc)) = 1.12.0
-Provides: bundled(golang(gopkg.in/yaml.v2)) = 2.2.1
-Provides: bundled(golang(gotest.tools)) = 2.1.0
-Provides: bundled(golang(k8s.io/api)) = 1.12.0
-Provides: bundled(golang(k8s.io/apimachinery)) = 1.12.0
-Provides: bundled(golang(k8s.io/apiserver)) = 1.12.0
-Provides: bundled(golang(k8s.io/client-go)) = 1.12.0
-Provides: bundled(golang(k8s.io/kubernetes)) = 1.12.0
-Provides: bundled(golang(k8s.io/utils)) = cd34563cd63c2bd7c6fe88a73c4dcf34ed8a67cb
+# grep -v -e '^$' -e '^#' containerd-*/vendor.conf | sort | awk
'{print "Provides: bundled(golang("$1")) = "$2}'
+Provides:
bundled(golang(github.com/beorn7/perks)) =
4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
+Provides:
bundled(golang(github.com/blang/semver)) = v3.1.0
+Provides:
bundled(golang(github.com/BurntSushi/toml)) =
a368813c5e648fee92e5f6c30e3944ff9d5e8895
+Provides:
bundled(golang(github.com/containerd/aufs)) =
ffa39970e26ad01d81f540b21e65f9c1841a5f92
+Provides:
bundled(golang(github.com/containerd/btrfs)) =
2e1aa0ddf94f91fa282b6ed87c23bf0d64911244
+Provides:
bundled(golang(github.com/containerd/cgroups)) =
5e610833b72089b37d0e615de9a92dfc043757c2
+Provides:
bundled(golang(github.com/containerd/console)) =
c12b1e7919c14469339a5d38f2f8ed9b64a9de23
+Provides:
bundled(golang(github.com/containerd/continuity)) =
bd77b46c8352f74eb12c85bdc01f4b90f69d66b4
+Provides:
bundled(golang(github.com/containerd/cri)) =
0ca1e3c2b73b5c38e72f29bb76338d0078b23d6c
+Provides:
bundled(golang(github.com/containerd/fifo)) =
3d5202aec260678c48179c56f40e6f38a095738c
+Provides:
bundled(golang(github.com/containerd/go-cni)) =
40bcf8ec8acd7372be1d77031d585d5d8e561c90
+Provides:
bundled(golang(github.com/containerd/go-runc)) =
5a6d9f37cfa36b15efba46dc7ea349fa9b7143c3
+Provides:
bundled(golang(github.com/containerd/ttrpc)) =
2a805f71863501300ae1976d29f0454ae003e85a
+Provides:
bundled(golang(github.com/containerd/typeurl)) =
a93fcdb778cd272c6e9b3028b2f42d813e785d40
+Provides:
bundled(golang(github.com/containerd/zfs)) =
9a0b8b8b5982014b729cd34eb7cd7a11062aa6ec
+Provides:
bundled(golang(github.com/containernetworking/cni)) = v0.6.0
+Provides:
bundled(golang(github.com/containernetworking/plugins)) = v0.7.0
+Provides:
bundled(golang(github.com/coreos/go-systemd)) =
48702e0da86bd25e76cfef347e2adeb434a0d0a6
+Provides:
bundled(golang(github.com/davecgh/go-spew)) = v1.1.0
+Provides:
bundled(golang(github.com/docker/distribution)) =
b38e5838b7b2f2ad48e06ec4b500011976080621
+Provides:
bundled(golang(github.com/docker/docker)) =
86f080cff0914e9694068ed78d503701667c4c00
+Provides:
bundled(golang(github.com/docker/go-events)) =
9461782956ad83b30282bf90e31fa6a70c255ba9
+Provides:
bundled(golang(github.com/docker/go-metrics)) =
4ea375f7759c82740c893fc030bc37088d2ec098
+Provides:
bundled(golang(github.com/docker/go-units)) = v0.3.1
+Provides:
bundled(golang(github.com/docker/spdystream)) =
449fdfce4d962303d702fec724ef0ad181c92528
+Provides:
bundled(golang(github.com/emicklei/go-restful)) = v2.2.1
+Provides:
bundled(golang(github.com/ghodss/yaml)) = v1.0.0
+Provides:
bundled(golang(github.com/godbus/dbus)) =
c7fdd8b5cd55e87b4e1f4e372cdb1db61dd6c66f
+Provides:
bundled(golang(github.com/gogo/googleapis)) =
08a7655d27152912db7aaf4f983275eaf8d128ef
+Provides:
bundled(golang(github.com/gogo/protobuf)) = v1.0.0
+Provides:
bundled(golang(github.com/golang/glog)) =
44145f04b68cf362d9c4df2182967c2275eaefed
+Provides:
bundled(golang(github.com/golang/protobuf)) = v1.1.0
+Provides:
bundled(golang(github.com/google/go-cmp)) = v0.1.0
+Provides:
bundled(golang(github.com/google/gofuzz)) =
44d81051d367757e1c7c6a5a86423ece9afcf63c
+Provides:
bundled(golang(github.com/grpc-ecosystem/go-grpc-prometheus)) =
6b7015e65d366bf3f19b2b2a000a831940f0f7e0
+Provides:
bundled(golang(github.com/hashicorp/errwrap)) =
7554cd9344cec97297fa6649b055a8c98c2a1e55
+Provides:
bundled(golang(github.com/hashicorp/go-multierror)) =
ed905158d87462226a13fe39ddf685ea65f1c11f
+Provides:
bundled(golang(github.com/json-iterator/go)) = 1.1.5
+Provides:
bundled(golang(github.com/matttproud/golang_protobuf_extensions)) =
v1.0.0
+Provides:
bundled(golang(github.com/Microsoft/go-winio)) = v0.4.11
+Provides:
bundled(golang(github.com/Microsoft/hcsshim)) = v0.8.1
+Provides:
bundled(golang(github.com/mistifyio/go-zfs)) =
166add352731e515512690329794ee593f1aaff2
+Provides:
bundled(golang(github.com/modern-go/concurrent)) = 1.0.3
+Provides:
bundled(golang(github.com/modern-go/reflect2)) = 1.0.1
+Provides:
bundled(golang(github.com/opencontainers/go-digest)) =
c9281466c8b2f606084ac71339773efd177436e7
+Provides:
bundled(golang(github.com/opencontainers/image-spec)) = v1.0.1
+Provides:
bundled(golang(github.com/opencontainers/runc)) =
96ec2177ae841256168fcf76954f7177af9446eb
+Provides:
bundled(golang(github.com/opencontainers/runtime-spec)) =
eba862dc2470385a233c7507392675cbeadf7353
+Provides:
bundled(golang(github.com/opencontainers/runtime-tools)) = v0.6.0
+Provides:
bundled(golang(github.com/opencontainers/selinux)) =
b6fa367ed7f534f9ba25391cc2d467085dbb445a
+Provides:
bundled(golang(github.com/pborman/uuid)) =
c65b2f87fee37d1c7854c9164a450713c28d50cd
+Provides:
bundled(golang(github.com/pkg/errors)) = v0.8.0
+Provides:
bundled(golang(github.com/prometheus/client_golang)) =
f4fb1b73fb099f396a7f0036bf86aa8def4ed823
+Provides:
bundled(golang(github.com/prometheus/client_model)) =
99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c
+Provides:
bundled(golang(github.com/prometheus/common)) =
89604d197083d4781071d3c65855d24ecfb0a563
+Provides:
bundled(golang(github.com/prometheus/procfs)) =
cb4147076ac75738c9a7d279075a253c0cc5acbd
+Provides:
bundled(golang(github.com/seccomp/libseccomp-golang)) =
32f571b70023028bd57d9288c20efbcb237f3ce0
+Provides:
bundled(golang(github.com/sirupsen/logrus)) = v1.0.0
+Provides:
bundled(golang(github.com/syndtr/gocapability)) =
db04d3cc01c8b54962a58ec7e491717d06cfcc16
+Provides:
bundled(golang(github.com/tchap/go-patricia)) = v2.2.6
+Provides:
bundled(golang(github.com/urfave/cli)) =
7bc6a0acffa589f415f88aca16cc1de5ffd66f9c
+Provides:
bundled(golang(github.com/xeipuuv/gojsonpointer)) =
4e3ac2762d5f479393488629ee9370b50873b3a6
+Provides:
bundled(golang(github.com/xeipuuv/gojsonreference)) =
bd5ef7bd5415a7ac448318e64f11a24cd21e594b
+Provides:
bundled(golang(github.com/xeipuuv/gojsonschema)) =
1d523034197ff1f222f6429836dd36a2457a1874
+Provides: bundled(golang(go.etcd.io/bbolt)) = v1.3.1-etcd.8
+Provides:
bundled(golang(golang.org/x/crypto)) =
49796115aa4b964c318aad4f3084fdb41e9aa067
+Provides:
bundled(golang(golang.org/x/net)) =
b3756b4b77d7b13260a0a2ec658753cf48922eac
+Provides:
bundled(golang(golang.org/x/oauth2)) =
a6bd8cefa1811bd24b86f8902872e4e8225f74c4
+Provides:
bundled(golang(golang.org/x/sync)) =
450f422ab23cf9881c94e2db30cac0eb1b7cf80c
+Provides:
bundled(golang(golang.org/x/sys)) =
1b2967e3c290b7c545b3db0deeda16e9be4f98a2
+Provides:
bundled(golang(golang.org/x/text)) =
19e51611da83d6be54ddafce4a4af510cb3e9ea4
+Provides:
bundled(golang(golang.org/x/time)) =
f51c12702a4d776e4c1fa9b0fabab841babae631
+Provides:
bundled(golang(google.golang.org/genproto)) =
d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
+Provides:
bundled(golang(google.golang.org/grpc)) = v1.12.0
+Provides: bundled(golang(gopkg.in/inf.v0)) =
3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
+Provides: bundled(golang(gopkg.in/yaml.v2)) = v2.2.1
+Provides: bundled(golang(gotest.tools)) = v2.1.0
+Provides: bundled(golang(k8s.io/api)) = kubernetes-1.12.0
+Provides: bundled(golang(k8s.io/apimachinery)) = kubernetes-1.12.0
+Provides: bundled(golang(k8s.io/apiserver)) = kubernetes-1.12.0
+Provides: bundled(golang(k8s.io/client-go)) = kubernetes-1.12.0
+Provides: bundled(golang(k8s.io/kubernetes)) = v1.12.0
+Provides: bundled(golang(k8s.io/utils)) = cd34563cd63c2bd7c6fe88a73c4dcf34ed8a67cb
%description
containerd is an industry-standard container runtime with an emphasis on
-simplicity, robustness and portability. It is available as a daemon for Linux
+simplicity, robustness and portability. It is available as a daemon for Linux
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.
%prep
-%autosetup -n containerd-%{version}
+%autosetup
%build
mkdir -p src/%(dirname %{import_path})
ln -s ../../.. src/%{import_path}
export GOPATH=$(pwd):%{gopath}
-export LDFLAGS="-X %{import_path}/version.Package=%{import_path} -X
%{import_path}/version.Version=%{tag} -X %{import_path}/version.Revision=%{commit}"
+export LDFLAGS="-X %{import_path}/version.Version=%{version}"
%gobuild -o bin/containerd %{import_path}/cmd/containerd
%gobuild -o bin/containerd-shim %{import_path}/cmd/containerd-shim
%gobuild -o bin/ctr %{import_path}/cmd/ctr
mkdir man
-go-md2man -in src/%{import_path}/docs/man/containerd.1.md -out man/containerd.1
-go-md2man -in src/%{import_path}/docs/man/containerd-config.1.md -out
man/containerd-config.1
-go-md2man -in src/%{import_path}/docs/man/ctr.1.md -out man/ctr.1
-go-md2man -in src/%{import_path}/docs/man/containerd-config.toml.5.md -out
man/containerd-config.toml.5
+go-md2man -in docs/man/containerd.1.md -out man/containerd.1
+go-md2man -in docs/man/containerd-config.1.md -out man/containerd-config.1
+go-md2man -in docs/man/ctr.1.md -out man/ctr.1
+go-md2man -in docs/man/containerd-config.toml.5.md -out man/containerd-config.toml.5
%install
@@ -134,16 +175,19 @@ install -D -m 0644 %{S:2}
%{buildroot}%{_sysconfdir}/containerd/config.toml
%{_bindir}/containerd
%{_bindir}/containerd-shim
%{_bindir}/ctr
-%{_unitdir}/containerd.service
%{_mandir}/man1/containerd.1*
%{_mandir}/man1/containerd-config.1*
%{_mandir}/man1/ctr.1*
%{_mandir}/man5/containerd-config.toml.5*
+%{_unitdir}/containerd.service
%dir %{_sysconfdir}/containerd
%config(noreplace) %{_sysconfdir}/containerd/config.toml
%changelog
+* Thu Jan 03 2019 Carl George <carl(a)george.computer> - 1.2.1-1
+- Latest upstream
+
* Thu Oct 25 2018 Carl George <carl(a)george.computer> - 1.2.0-1
- Latest upstream
diff --git a/sources b/sources
index 29609f3..fd3ffb8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (containerd-1.2.0.tar.gz) =
f7e1ede8db253c666dc9d68642951a427722945da60acf8631312377c84aab14c7a8b14e81f9a63ab8f909d25eb55911c0f2eef68f11380c66cd77bada8577bd
+SHA512 (containerd-1.2.1.tar.gz) =
0949299afe17e269a6c551e865e500afeeaba700cf78bb12fef4af8e6d48a2f699976e81dad44d797bb13079361f5d5e05e9abe903a3b158af93f2aaa95712e5