diff --git a/.docker-distribution.metadata b/.docker-distribution.metadata index d0e0a0c..f13ffad 100644 --- a/.docker-distribution.metadata +++ b/.docker-distribution.metadata @@ -1 +1 @@ -19b1db1bf3d64b5ecf086dc9d5ef17bec999ae0b SOURCES/03efb43768979f4d2ea5187bef995656441829e5.tar.gz +94dc11372604d4dd919c9b9792033cfce2975e35 SOURCES/a9b1322edf48b1fb9aee4e5ded7a4f4ac37c6830.tar.gz diff --git a/.gitignore b/.gitignore index d999580..4fe3bb9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/03efb43768979f4d2ea5187bef995656441829e5.tar.gz +SOURCES/a9b1322edf48b1fb9aee4e5ded7a4f4ac37c6830.tar.gz diff --git a/SPECS/docker-distribution.spec b/SPECS/docker-distribution.spec index 621404c..69d4ee4 100644 --- a/SPECS/docker-distribution.spec +++ b/SPECS/docker-distribution.spec @@ -33,12 +33,12 @@ # https://github.com/docker/distribution %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 03efb43768979f4d2ea5187bef995656441829e5 +%global commit a9b1322edf48b1fb9aee4e5ded7a4f4ac37c6830 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: %{project}-%{repo} -Version: 2.4.1 -Release: 2%{?dist} +Version: 2.5.0 +Release: 1%{?dist} Summary: Docker toolset to pack, ship, store, and deliver content License: ASL 2.0 URL: https://%{provider_prefix} @@ -223,6 +223,7 @@ providing packages with %{import_path} prefix. %setup -q -n %{repo}-%{commit} pushd vendor +sed -i 's/elliptic.P224(), //' golang.org/x/crypto/ocsp/ocsp.go mkdir src mv g* src/. popd @@ -339,6 +340,10 @@ make test %endif %changelog +* Wed Sep 07 2016 Lokesh Mandvekar - 2.5.0-1 +- Resolves: #1367157 - rebase to v2.5.0 +- golang 1.6.2 doesn't support elliptic.P224() + * Sat Jun 25 2016 Lokesh Mandvekar - 2.4.1-2 - built with golang >= 1.6.2