commit 281de149b491164ce3c97dec567787bba7aabdf0 Author: Adam Miller admiller@redhat.com Date: Thu Feb 20 15:53:41 2014 -0600
import lsm5's latest docker-io SRPM
docker-io.spec | 29 ++++++---- docker.sysconfig | 1 - docker.sysvinit | 123 --------------------------------------------- remove-vendored-tar.patch | 109 +++++++++++++++++++++++++++++++++++++++ sources | 2 +- 5 files changed, 127 insertions(+), 137 deletions(-) --- diff --git a/docker-io.spec b/docker-io.spec index 7976363..8b7fbb9 100644 --- a/docker-io.spec +++ b/docker-io.spec @@ -9,30 +9,29 @@ %global debug_package %{nil} %global gopath %{_datadir}/gocode
-%global commit cc3a8c8d8ec57e15b7b7316797132d770408ab1a +%global commit a1598d1e1c157388f3b07415729de28f4d205e49 %global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io -Version: 0.8.0 -Release: 3%{?dist} +Version: 0.8.1 +Release: 1%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0
Patch0: ignore-btrfs-for-rhel.patch +Patch1: remove-vendored-tar.patch URL: http://www.docker.io # only x86_64 for now: https://github.com/dotcloud/docker/issues/136 ExclusiveArch: x86_64 Source0: https://github.com/dotcloud/docker/archive/v%%7Bversion%7D.tar.gz # though final name for sysconf/sysvinit files is simply 'docker', # having .sysvinit and .sysconfig makes things clear -Source1: docker.sysconfig -Source2: docker.sysvinit -Source3: docker.1 +Source1: docker.1 BuildRequires: gcc BuildRequires: glibc-static -# ensure build uses golang 1.2 and above -# https://github.com/dotcloud/docker/issues/3191 -BuildRequires: golang >= 1.2 +# ensure build uses golang 1.2-7 and above +# http://code.google.com/p/go/source/detail?r=a15f344a9efa35ef168c8feaa92a15a1... +BuildRequires: golang >= 1.2-7 BuildRequires: golang(github.com/gorilla/mux) BuildRequires: golang(github.com/kr/pty) BuildRequires: golang(code.google.com/p/go.net/websocket) @@ -82,6 +81,7 @@ rm -rf vendor %if 0%{?rhel} %patch0 -p1 -b ignore-btrfs-for-rhel %endif +%patch1 -p1 -b remove-vendored-tar
%build mkdir _build @@ -107,7 +107,7 @@ install -d %{buildroot}%{_libexecdir}/docker install -p -m 755 bundles/%{version}/dynbinary/dockerinit-%{version} %{buildroot}%{_libexecdir}/docker/dockerinit # install manpage install -d %{buildroot}%{_mandir}/man1 -install -p -m 644 %{SOURCE3} %{buildroot}%{_mandir}/man1 +install -p -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man1 # install bash completion install -d %{buildroot}%{_sysconfdir}/bash_completion.d install -p -m 644 contrib/completion/bash/docker %{buildroot}%{_sysconfdir}/bash_completion.d/docker.bash @@ -130,9 +130,9 @@ install -d %{buildroot}%{_unitdir} install -p -m 644 contrib/init/systemd/docker.service %{buildroot}%{_unitdir} %else install -d %{buildroot}%{_sysconfdir}/sysconfig/ -install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/docker +install -p -m 644 contrib/init/sysvinit-redhat/docker.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/docker install -d %{buildroot}%{_initddir} -install -p -m 755 %{SOURCE2} %{buildroot}%{_initddir}/docker +install -p -m 755 contrib/init/sysvinit-redhat/docker %{buildroot}%{_initddir}/docker %endif
%pre @@ -192,6 +192,11 @@ fi %{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog +* 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 +- BR golang >= 1.2-7 + * Thu Feb 13 2014 Adam Miller maxamillion@fedoraproject.org - 0.8.0-3 - Remove unneeded sysctl settings in initscript https://github.com/dotcloud/docker/pull/4125 diff --git a/remove-vendored-tar.patch b/remove-vendored-tar.patch new file mode 100644 index 0000000..d180bc2 --- /dev/null +++ b/remove-vendored-tar.patch @@ -0,0 +1,109 @@ +From 093f9f11373c3414abb30b74b1271a80822f2d90 Mon Sep 17 00:00:00 2001 +From: Lokesh Mandvekar lsm5@redhat.com +Date: Wed, 19 Feb 2014 20:49:50 -0500 +Subject: [PATCH] remove vendored tar + +--- + archive/archive.go | 2 +- + archive/changes.go | 2 +- + archive/diff.go | 2 +- + archive/wrap.go | 2 +- + integration/api_test.go | 2 +- + integration/utils_test.go | 2 +- + utils/tarsum.go | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/archive/archive.go b/archive/archive.go +index 16c0199..817d37e 100644 +--- a/archive/archive.go ++++ b/archive/archive.go +@@ -2,7 +2,7 @@ package archive + + import ( + "bytes" +- "code.google.com/p/go/src/pkg/archive/tar" ++ "archive/tar" + "compress/bzip2" + "compress/gzip" + "errors" +diff --git a/archive/changes.go b/archive/changes.go +index b46b13b..25406f5 100644 +--- a/archive/changes.go ++++ b/archive/changes.go +@@ -1,7 +1,7 @@ + package archive + + import ( +- "code.google.com/p/go/src/pkg/archive/tar" ++ "archive/tar" + "fmt" + "github.com/dotcloud/docker/utils" + "io" +diff --git a/archive/diff.go b/archive/diff.go +index 6a77839..7bf01f3 100644 +--- a/archive/diff.go ++++ b/archive/diff.go +@@ -1,7 +1,7 @@ + package archive + + import ( +- "code.google.com/p/go/src/pkg/archive/tar" ++ "archive/tar" + "fmt" + "io" + "io/ioutil" +diff --git a/archive/wrap.go b/archive/wrap.go +index 981420b..0abe320 100644 +--- a/archive/wrap.go ++++ b/archive/wrap.go +@@ -2,7 +2,7 @@ package archive + + import ( + "bytes" +- "code.google.com/p/go/src/pkg/archive/tar" ++ "archive/tar" + "io/ioutil" + ) + +diff --git a/integration/api_test.go b/integration/api_test.go +index 5779e6b..e8ef626 100644 +--- a/integration/api_test.go ++++ b/integration/api_test.go +@@ -3,7 +3,7 @@ package docker + import ( + "bufio" + "bytes" +- "code.google.com/p/go/src/pkg/archive/tar" ++ "archive/tar" + "encoding/json" + "fmt" + "github.com/dotcloud/docker" +diff --git a/integration/utils_test.go b/integration/utils_test.go +index 947ace1..59297fa 100644 +--- a/integration/utils_test.go ++++ b/integration/utils_test.go +@@ -2,7 +2,7 @@ package docker + + import ( + "bytes" +- "code.google.com/p/go/src/pkg/archive/tar" ++ "archive/tar" + "fmt" + "io" + "io/ioutil" +diff --git a/utils/tarsum.go b/utils/tarsum.go +index ddeecfb..be8b4db 100644 +--- a/utils/tarsum.go ++++ b/utils/tarsum.go +@@ -2,7 +2,7 @@ package utils + + import ( + "bytes" +- "code.google.com/p/go/src/pkg/archive/tar" ++ "archive/tar" + "compress/gzip" + "crypto/sha256" + "encoding/hex" +-- +1.9.0 + diff --git a/sources b/sources index 4c76ff3..b77c489 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -737aec190c2ad81b00192f858f9ed31b v0.8.0.tar.gz +3e74f5af4a74f3448a1db5763e455eb9 v0.8.1.tar.gz
golang@lists.fedoraproject.org
-
Lokesh Mandvekar