commit 6d090e480bf43e15372369925e5777ce734f7aa3 Author: Lokesh Mandvekar lsm5@redhat.com Date: Tue Mar 11 11:11:21 2014 -0400

BZ 1074880 - bump to v0.9.0.

docker-io.spec | 11 ++- remove-vendored-tar.patch | 109 ------------------------------------ sources | 2 +- upstream-patched-archive-tar.patch | 108 +++++++++++++++++++++++++++++++++++ 4 files changed, 116 insertions(+), 114 deletions(-) --- diff --git a/docker-io.spec b/docker-io.spec index 8b7fbb9..1b1e167 100644 --- a/docker-io.spec +++ b/docker-io.spec @@ -9,17 +9,17 @@ %global debug_package %{nil} %global gopath %{_datadir}/gocode

-%global commit a1598d1e1c157388f3b07415729de28f4d205e49 +%global commit 2b3fdf2344fee3affc44c93a034ce894af4d6193 %global shortcommit %(c=%{commit}; echo ${c:0:7})

Name: docker-io -Version: 0.8.1 +Version: 0.9.0 Release: 1%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0

Patch0: ignore-btrfs-for-rhel.patch -Patch1: remove-vendored-tar.patch +Patch1: upstream-patched-archive-tar.patch URL: http://www.docker.io # only x86_64 for now: https://github.com/dotcloud/docker/issues/136 ExclusiveArch: x86_64 @@ -81,7 +81,7 @@ rm -rf vendor %if 0%{?rhel} %patch0 -p1 -b ignore-btrfs-for-rhel %endif -%patch1 -p1 -b remove-vendored-tar +%patch1 -p1 -b upstream-patched-archive-tar

%build mkdir _build @@ -192,6 +192,9 @@ fi %{_datadir}/vim/vimfiles/syntax/dockerfile.vim

%changelog +* Tue Mar 11 2014 Lokesh Mandvekar lsm5@redhat.com - 0.9.0-1 +- BZ 1074880 - upstream version bump to v0.9.0 + * Wed Feb 19 2014 Lokesh Mandvekar lsm5@redhat.com - 0.8.1-1 - Bug 1066841 - upstream version bump to v0.8.1 - use sysvinit files from upstream contrib diff --git a/sources b/sources index b77c489..ef99d3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3e74f5af4a74f3448a1db5763e455eb9 v0.8.1.tar.gz +5969bb91ec4f17aa381831046fb15531 v0.9.0.tar.gz diff --git a/upstream-patched-archive-tar.patch b/upstream-patched-archive-tar.patch new file mode 100644 index 0000000..b0fd2fd --- /dev/null +++ b/upstream-patched-archive-tar.patch @@ -0,0 +1,108 @@ +diff -uNr docker-0.9.0/archive/archive.go docker-0.9.0-1/archive/archive.go +--- docker-0.9.0/archive/archive.go 2014-03-10 12:57:10.000000000 -0400 ++++ docker-0.9.0-1/archive/archive.go 2014-03-11 10:35:04.577207349 -0400 +@@ -8,7 +8,7 @@ + "fmt" + "github.com/dotcloud/docker/pkg/system" + "github.com/dotcloud/docker/utils" +- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" ++ "archive/tar" + "io" + "io/ioutil" + "os" +diff -uNr docker-0.9.0/archive/archive_test.go docker-0.9.0-1/archive/archive_test.go +--- docker-0.9.0/archive/archive_test.go 2014-03-10 12:57:10.000000000 -0400 ++++ docker-0.9.0-1/archive/archive_test.go 2014-03-11 10:34:03.705484166 -0400 +@@ -3,7 +3,7 @@ + import ( + "bytes" + "fmt" +- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" ++ "archive/tar" + "io" + "io/ioutil" + "os" +diff -uNr docker-0.9.0/archive/changes.go docker-0.9.0-1/archive/changes.go +--- docker-0.9.0/archive/changes.go 2014-03-10 12:57:10.000000000 -0400 ++++ docker-0.9.0-1/archive/changes.go 2014-03-11 10:34:40.196318221 -0400 +@@ -5,7 +5,7 @@ + "fmt" + "github.com/dotcloud/docker/pkg/system" + "github.com/dotcloud/docker/utils" +- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" ++ "archive/tar" + "io" + "os" + "path/filepath" +diff -uNr docker-0.9.0/archive/diff.go docker-0.9.0-1/archive/diff.go +--- docker-0.9.0/archive/diff.go 2014-03-10 12:57:10.000000000 -0400 ++++ docker-0.9.0-1/archive/diff.go 2014-03-11 10:34:25.722384042 -0400 +@@ -2,7 +2,7 @@ + + import ( + "fmt" +- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" ++ "archive/tar" + "io" + "io/ioutil" + "os" +diff -uNr docker-0.9.0/archive/wrap.go docker-0.9.0-1/archive/wrap.go +--- docker-0.9.0/archive/wrap.go 2014-03-10 12:57:10.000000000 -0400 ++++ docker-0.9.0-1/archive/wrap.go 2014-03-11 10:34:15.296431455 -0400 +@@ -2,7 +2,7 @@ + + import ( + "bytes" +- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" ++ "archive/tar" + "io/ioutil" + ) + +diff -uNr docker-0.9.0/integration/api_test.go docker-0.9.0-1/integration/api_test.go +--- docker-0.9.0/integration/api_test.go 2014-03-10 12:57:10.000000000 -0400 ++++ docker-0.9.0-1/integration/api_test.go 2014-03-11 10:35:17.048150637 -0400 +@@ -11,7 +11,7 @@ + "github.com/dotcloud/docker/engine" + "github.com/dotcloud/docker/runconfig" + "github.com/dotcloud/docker/utils" +- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" ++ "archive/tar" + "io" + "io/ioutil" + "net" +diff -uNr docker-0.9.0/integration/utils_test.go docker-0.9.0-1/integration/utils_test.go +--- docker-0.9.0/integration/utils_test.go 2014-03-10 12:57:10.000000000 -0400 ++++ docker-0.9.0-1/integration/utils_test.go 2014-03-11 10:35:31.429085241 -0400 +@@ -3,7 +3,7 @@ + import ( + "bytes" + "fmt" +- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" ++ "archive/tar" + "io" + "io/ioutil" + "net/http" +diff -uNr docker-0.9.0/utils/tarsum.go docker-0.9.0-1/utils/tarsum.go +--- docker-0.9.0/utils/tarsum.go 2014-03-10 12:57:10.000000000 -0400 ++++ docker-0.9.0-1/utils/tarsum.go 2014-03-11 10:35:44.731024753 -0400 +@@ -5,7 +5,7 @@ + "compress/gzip" + "crypto/sha256" + "encoding/hex" +- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" ++ "archive/tar" + "hash" + "io" + "sort" +diff -uNr docker-0.9.0/utils_test.go docker-0.9.0-1/utils_test.go +--- docker-0.9.0/utils_test.go 2014-03-10 12:57:10.000000000 -0400 ++++ docker-0.9.0-1/utils_test.go 2014-03-11 10:35:55.151977365 -0400 +@@ -2,7 +2,7 @@ + + import ( + "bytes" +- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" ++ "archive/tar" + "io" + ) +