From 08d59ac26075027ddc810c17831b7178ae6f1e37 Mon Sep 17 00:00:00 2001
From: Carl George <carl@george.computer>
Date: Dec 06 2017 23:34:51 +0000
Subject: Latest upstream


---

diff --git a/.gitignore b/.gitignore
index 258a454..f49a9f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /containerd-1.0.0-beta.2.tar.gz
 /containerd-1.0.0-beta.3.tar.gz
+/containerd-1.0.0.tar.gz
diff --git a/containerd.spec b/containerd.spec
index ed51c47..fdbbe0d 100644
--- a/containerd.spec
+++ b/containerd.spec
@@ -12,19 +12,14 @@
 %endif
 
 %global import_path github.com/containerd/containerd
-%global prever beta.3
 
 Name: containerd
 Version: 1.0.0
-%if 0%{?prever:1}
-Release: 0.5.%{?prever}%{?dist}
-%else
-Release: 5%{?dist}
-%endif
+Release: 1%{?dist}
 Summary: An industry-standard container runtime
 License: ASL 2.0
 URL: https://containerd.io
-Source0: https://%{import_path}/archive/v%{version}%{?prever:-%{prever}}/containerd-%{version}%{?prever:-%{prever}}.tar.gz
+Source0: https://%{import_path}/archive/v%{version}/containerd-%{version}.tar.gz
 Source1: containerd.service
 Source2: containerd.toml
 ExclusiveArch: %{go_arches}
@@ -41,7 +36,7 @@ Provides: bundled(golang(github.com/beorn7/perks)) = 4c0e84591b9aa9e6dcfdf3e0201
 Provides: bundled(golang(github.com/boltdb/bolt)) = e9cf4fae01b5a8ff89d0ec6b32f0d9c9f79aefdd
 Provides: bundled(golang(github.com/BurntSushi/toml)) = 99064174e013895bbd9b025c31100bd1d9b590ca
 Provides: bundled(golang(github.com/containerd/btrfs)) = cc52c4dea2ce11a44e6639e561bb5c2af9ada9e3
-Provides: bundled(golang(github.com/containerd/cgroups)) = f7dd103d3e4e696aa67152f6b4ddd1779a3455a9
+Provides: bundled(golang(github.com/containerd/cgroups)) = 29da22c6171a4316169f9205ab6c49f59b5b852f
 Provides: bundled(golang(github.com/containerd/console)) = 84eeaae905fa414d03e07bcd6c8d3f19e7cf180e
 Provides: bundled(golang(github.com/containerd/continuity)) = cf279e6ac893682272b4479d4c67fd3abf878b4e
 Provides: bundled(golang(github.com/containerd/fifo)) = fbfb6a11ec671efbe94ad1c12c2e98773f19e1e6
@@ -49,17 +44,17 @@ Provides: bundled(golang(github.com/containerd/go-runc)) = ed1cbe1fc31f5fb2359d3
 Provides: bundled(golang(github.com/containerd/typeurl)) = f6943554a7e7e88b3c14aad190bf05932da84788
 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/dmcgowan/go-tar)) = 2e2c51242e8993c50445dab7c03c8e7febddd0cf
+Provides: bundled(golang(github.com/dmcgowan/go-tar)) = go1.10
 Provides: bundled(golang(github.com/docker/go-events)) = 9461782956ad83b30282bf90e31fa6a70c255ba9
 Provides: bundled(golang(github.com/docker/go-metrics)) = 8fd5772bf1584597834c6f7961a530f06cbfbb87
 Provides: bundled(golang(github.com/docker/go-units)) = v0.3.1
 Provides: bundled(golang(github.com/godbus/dbus)) = c7fdd8b5cd55e87b4e1f4e372cdb1db61dd6c66f
-Provides: bundled(golang(github.com/gogo/protobuf)) = d2e1ade2d719b78fe5b061b4c18a9f7111b5bdc8
-Provides: bundled(golang(github.com/golang/protobuf)) = 5a0f697c9ed9d68fef0116532c6e05cfeae00e55
+Provides: bundled(golang(github.com/gogo/protobuf)) = v0.5
+Provides: bundled(golang(github.com/golang/protobuf)) = 1643683e1b54a9e88ad26d98f81400c8c9d9f4f9
 Provides: bundled(golang(github.com/grpc-ecosystem/go-grpc-prometheus)) = 6b7015e65d366bf3f19b2b2a000a831940f0f7e0
 Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = v1.0.0
 Provides: bundled(golang(github.com/Microsoft/go-winio)) = v0.4.4
-Provides: bundled(golang(github.com/Microsoft/hcsshim)) = v0.6.3
+Provides: bundled(golang(github.com/Microsoft/hcsshim)) = v0.6.7
 Provides: bundled(golang(github.com/Microsoft/opengcs)) = v0.3.2
 Provides: bundled(golang(github.com/opencontainers/go-digest)) = 21dfd564fd89c944783d00d069f33e3e7123c448
 Provides: bundled(golang(github.com/opencontainers/image-spec)) = v1.0.0
@@ -72,6 +67,7 @@ Provides: bundled(golang(github.com/prometheus/client_model)) = fa8ad6fec33561be
 Provides: bundled(golang(github.com/prometheus/common)) = 195bde7883f7c39ea62b0d92ab7359b5327065cb
 Provides: bundled(golang(github.com/prometheus/procfs)) = fcdb11ccb4389efb1b210b7ffb623ab71c5fdd60
 Provides: bundled(golang(github.com/sirupsen/logrus)) = v1.0.0
+Provides: bundled(golang(github.com/stevvooe/ttrpc)) = 76e68349ad9ab4d03d764c713826d31216715e4f
 Provides: bundled(golang(github.com/stretchr/testify)) = v1.1.4
 Provides: bundled(golang(github.com/urfave/cli)) = 7bc6a0acffa589f415f88aca16cc1de5ffd66f9c
 Provides: bundled(golang(golang.org/x/net)) = 7dcfb8076726a3fdd9353b6b8a1f1b6be6811bd6
@@ -79,7 +75,7 @@ Provides: bundled(golang(golang.org/x/sync)) = 450f422ab23cf9881c94e2db30cac0eb1
 Provides: bundled(golang(golang.org/x/sys)) = 314a259e304ff91bd6985da2a7149bbf91237993
 Provides: bundled(golang(golang.org/x/text)) = 19e51611da83d6be54ddafce4a4af510cb3e9ea4
 Provides: bundled(golang(google.golang.org/genproto)) = d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
-Provides: bundled(golang(google.golang.org/grpc)) = v1.3.0
+Provides: bundled(golang(google.golang.org/grpc)) = v1.7.2
 
 
 %description
@@ -91,14 +87,14 @@ low-level storage and network attachments, etc.
 
 
 %prep
-%autosetup -n containerd-%{version}%{?prever:-%{prever}}
+%autosetup -n containerd-%{version}
 
 
 %build
 mkdir -p src/%(dirname %{import_path})
 ln -s ../../.. src/%{import_path}
 export GOPATH=$(pwd):%{gopath}
-export LDFLAGS="-X %{import_path}/version.Version=%{version} -X %{import_path}/version.Revision=v%{version}%{?prever:-%{prever}} -X %{import_path}/version.Package=%{import_path}"
+export LDFLAGS="-X %{import_path}/version.Version=%{version} -X %{import_path}/version.Revision=v%{version} -X %{import_path}/version.Package=%{import_path}"
 %gobuild -o bin/containerd %{import_path}/cmd/containerd
 %gobuild -o bin/containerd-shim %{import_path}/cmd/containerd-shim
 %{?with_ctr:%gobuild -o bin/ctr %{import_path}/cmd/ctr}
@@ -136,6 +132,9 @@ install -D -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/containerd/config.toml
 
 
 %changelog
+* Wed Dec 06 2017 Carl George <carl@george.computer> - 1.0.0-1
+- Latest upstream
+
 * Fri Nov 10 2017 Carl George <carl@george.computer> - 1.0.0-0.5.beta.3
 - Latest upstream
 
diff --git a/sources b/sources
index 27f380e..e28ff50 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (containerd-1.0.0-beta.3.tar.gz) = 45853001bcf57f7289747b71215eb0bc60b18e54db73896779f294db1b72374cf36c8792371a8d46ddfe283dfc9655f10cb61b3a74420a79a4abb9fa89b76323
+SHA512 (containerd-1.0.0.tar.gz) = 8c1a03de7f30976675e4482b4f18f4b87da56108de4d92f2e33b4cb4f8c188af5b3fad87971a294eac8442a0fb6ddae48cda81334c363203a8c8bdfc09176a7a