[docker-io/f20] Bug 1095616 - upstream bump to 0.11.1
Lokesh Mandvekar
lsm5 at fedoraproject.org
Thu May 8 16:04:01 UTC 2014
commit 2c1a9390b114cf9078fc9377ecfa5643f4dda550
Author: Lokesh Mandvekar <lsm5 at redhat.com>
Date: Thu May 8 12:04:08 2014 -0400
Bug 1095616 - upstream bump to 0.11.1
docker-io.spec | 21 +++++++-
sources | 2 +-
upstream-patched-archive-tar.patch | 87 ++++++++++++++++--------------------
3 files changed, 58 insertions(+), 52 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index cd576f9..17ffffd 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -9,12 +9,12 @@
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit dc9c28f51d669d6b09e81c2381f800f1a33bb659
+%global commit fb99f992c081a1d433c97c99ffb46d12693eeb76
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
-Version: 0.10.0
-Release: 2%{?dist}
+Version: 0.11.1
+Release: 1%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
@@ -30,9 +30,11 @@ Source0: https://github.com/dotcloud/docker/archive/v%{version}.tar.gz
# having .sysvinit and .sysconfig makes things clear
BuildRequires: gcc
BuildRequires: glibc-static
+
# ensure build uses golang 1.2-7 and above
# http://code.google.com/p/go/source/detail?r=a15f344a9efa35ef168c8feaa92a15a1cdc93db5
BuildRequires: golang >= 1.2-7
+
BuildRequires: golang(github.com/gorilla/mux)
BuildRequires: golang(github.com/kr/pty)
BuildRequires: golang(github.com/godbus/dbus)
@@ -41,21 +43,29 @@ BuildRequires: golang(code.google.com/p/go.net/websocket)
BuildRequires: golang(code.google.com/p/gosqlite/sqlite3)
BuildRequires: golang(github.com/syndtr/gocapability/capability)
BuildRequires: device-mapper-devel
+
# btrfs not available for rhel yet
%if 0%{?fedora}
BuildRequires: btrfs-progs-devel
%endif
+
%if %{with systemd}
BuildRequires: pkgconfig(systemd)
+
+# Build upstream docs with pandoc
+BuildRequires: pandoc
+
Requires: systemd-units
%else
Requires(post): chkconfig
Requires(preun): chkconfig
Requires(postun): initscripts
%endif
+
# need xz to work with ubuntu images
# https://bugzilla.redhat.com/show_bug.cgi?id=1045220
Requires: xz
+
# https://bugzilla.redhat.com/show_bug.cgi?id=1035436
# this won't be needed for rhel7+
%if 0%{?rhel} >= 6 && 0%{?rhel} < 7
@@ -100,6 +110,7 @@ export DOCKER_GITCOMMIT="%{shortcommit}/%{version}"
export GOPATH=$(pwd)/_build:%{gopath}
hack/make.sh dynbinary
+contrib/man/md/md2man-all.sh
cp contrib/syntax/vim/LICENSE LICENSE-vim-syntax
cp contrib/syntax/vim/README.md README-vim-syntax.md
@@ -197,6 +208,10 @@ fi
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Thu May 08 2014 Lokesh Mandvekar <lsm5 at redhat.com> - 0.11.1-1
+- Bug 1095616 - upstream bump to 0.11.1
+- manpages via pandoc
+
* Mon Apr 14 2014 Lokesh Mandvekar <lsm5 at redhat.com> - 0.10.0-2
- regenerate btrfs removal patch
- update commit value
diff --git a/sources b/sources
index 8f84b86..6c0b0dc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1a9b569b1627a51b0ce6e85eaad459c4 v0.10.0.tar.gz
+6496901bfc30aa8094411a0dd6c10ab5 v0.11.1.tar.gz
diff --git a/upstream-patched-archive-tar.patch b/upstream-patched-archive-tar.patch
index 225b1ab..7c3799b 100644
--- a/upstream-patched-archive-tar.patch
+++ b/upstream-patched-archive-tar.patch
@@ -1,8 +1,7 @@
-diff --git a/archive/archive.go b/archive/archive.go
-index 2fac18e..634e9c1 100644
---- a/archive/archive.go
-+++ b/archive/archive.go
-@@ -8,7 +8,7 @@ import (
+diff -uNr docker-0.11.1/archive/archive.go docker-0.11.1-1/archive/archive.go
+--- docker-0.11.1/archive/archive.go 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/archive/archive.go 2014-05-08 11:53:24.197382578 -0400
+@@ -8,7 +8,7 @@
"fmt"
"github.com/dotcloud/docker/pkg/system"
"github.com/dotcloud/docker/utils"
@@ -11,11 +10,10 @@ index 2fac18e..634e9c1 100644
"io"
"io/ioutil"
"os"
-diff --git a/archive/archive_test.go b/archive/archive_test.go
-index 4126601..ca5a80c 100644
---- a/archive/archive_test.go
-+++ b/archive/archive_test.go
-@@ -3,7 +3,7 @@ package archive
+diff -uNr docker-0.11.1/archive/archive_test.go docker-0.11.1-1/archive/archive_test.go
+--- docker-0.11.1/archive/archive_test.go 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/archive/archive_test.go 2014-05-08 11:52:50.154420013 -0400
+@@ -3,7 +3,7 @@
import (
"bytes"
"fmt"
@@ -24,11 +22,10 @@ index 4126601..ca5a80c 100644
"io"
"io/ioutil"
"os"
-diff --git a/archive/changes.go b/archive/changes.go
-index 723e4a7..51baa22 100644
---- a/archive/changes.go
-+++ b/archive/changes.go
-@@ -5,7 +5,7 @@ import (
+diff -uNr docker-0.11.1/archive/changes.go docker-0.11.1-1/archive/changes.go
+--- docker-0.11.1/archive/changes.go 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/archive/changes.go 2014-05-08 11:53:15.965391535 -0400
+@@ -5,7 +5,7 @@
"fmt"
"github.com/dotcloud/docker/pkg/system"
"github.com/dotcloud/docker/utils"
@@ -37,11 +34,10 @@ index 723e4a7..51baa22 100644
"io"
"os"
"path/filepath"
-diff --git a/archive/diff.go b/archive/diff.go
-index e20e4b1..a67b48a 100644
---- a/archive/diff.go
-+++ b/archive/diff.go
-@@ -2,7 +2,7 @@ package archive
+diff -uNr docker-0.11.1/archive/diff.go docker-0.11.1-1/archive/diff.go
+--- docker-0.11.1/archive/diff.go 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/archive/diff.go 2014-05-08 11:53:05.638403007 -0400
+@@ -2,7 +2,7 @@
import (
"fmt"
@@ -50,11 +46,10 @@ index e20e4b1..a67b48a 100644
"io"
"io/ioutil"
"os"
-diff --git a/archive/wrap.go b/archive/wrap.go
-index 03ea508..0abe320 100644
---- a/archive/wrap.go
-+++ b/archive/wrap.go
-@@ -2,7 +2,7 @@ package archive
+diff -uNr docker-0.11.1/archive/wrap.go docker-0.11.1-1/archive/wrap.go
+--- docker-0.11.1/archive/wrap.go 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/archive/wrap.go 2014-05-08 11:52:57.609411753 -0400
+@@ -2,7 +2,7 @@
import (
"bytes"
@@ -63,37 +58,34 @@ index 03ea508..0abe320 100644
"io/ioutil"
)
-diff --git a/graph/tags_unit_test.go b/graph/tags_unit_test.go
-index 1777391..5cfe4c2 100644
---- a/graph/tags_unit_test.go
-+++ b/graph/tags_unit_test.go
-@@ -6,7 +6,7 @@ import (
- "github.com/dotcloud/docker/runtime/graphdriver"
- _ "github.com/dotcloud/docker/runtime/graphdriver/vfs" // import the vfs driver so it is used in the tests
+diff -uNr docker-0.11.1/graph/tags_unit_test.go docker-0.11.1-1/graph/tags_unit_test.go
+--- docker-0.11.1/graph/tags_unit_test.go 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/graph/tags_unit_test.go 2014-05-08 11:53:37.269368203 -0400
+@@ -6,7 +6,7 @@
+ _ "github.com/dotcloud/docker/daemon/graphdriver/vfs" // import the vfs driver so it is used in the tests
+ "github.com/dotcloud/docker/image"
"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"
-diff --git a/integration/api_test.go b/integration/api_test.go
-index 26441a2..a313382 100644
---- a/integration/api_test.go
-+++ b/integration/api_test.go
-@@ -21,7 +21,7 @@ import (
+diff -uNr docker-0.11.1/integration/api_test.go docker-0.11.1-1/integration/api_test.go
+--- docker-0.11.1/integration/api_test.go 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/integration/api_test.go 2014-05-08 11:53:45.654359060 -0400
+@@ -21,7 +21,7 @@
+ "github.com/dotcloud/docker/image"
"github.com/dotcloud/docker/runconfig"
- "github.com/dotcloud/docker/runtime"
"github.com/dotcloud/docker/utils"
- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
+ "archive/tar"
)
func TestGetEvents(t *testing.T) {
-diff --git a/integration/utils_test.go b/integration/utils_test.go
-index 8ad6ccb..5b16f2a 100644
---- a/integration/utils_test.go
-+++ b/integration/utils_test.go
-@@ -3,7 +3,7 @@ package docker
+diff -uNr docker-0.11.1/integration/utils_test.go docker-0.11.1-1/integration/utils_test.go
+--- docker-0.11.1/integration/utils_test.go 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/integration/utils_test.go 2014-05-08 11:53:52.186351827 -0400
+@@ -3,7 +3,7 @@
import (
"bytes"
"fmt"
@@ -102,11 +94,10 @@ index 8ad6ccb..5b16f2a 100644
"io"
"io/ioutil"
"net/http"
-diff --git a/utils/tarsum.go b/utils/tarsum.go
-index 67e94aa..5132194 100644
---- a/utils/tarsum.go
-+++ b/utils/tarsum.go
-@@ -5,7 +5,7 @@ import (
+diff -uNr docker-0.11.1/utils/tarsum.go docker-0.11.1-1/utils/tarsum.go
+--- docker-0.11.1/utils/tarsum.go 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/utils/tarsum.go 2014-05-08 11:54:02.536340440 -0400
+@@ -5,7 +5,7 @@
"compress/gzip"
"crypto/sha256"
"encoding/hex"
More information about the scm-commits
mailing list