up to 0.6.0

diff --git a/lxc-docker.spec b/lxc-docker.spec
index fb4df2e291eb9a53e4390fb88b1ccbe2cfcb598b..72652d20f1845fb61253df99b3ea505a93b5842c 100644 (file)
--- a/lxc-docker.spec
+++ b/lxc-docker.spec
@@ -1,17 +1,24 @@
 Summary:       Docker: the Linux container engine
 Name:          lxc-docker
-Version:       0.5.3
+Version:       0.6.0
 Release:       1
 License:       Apache v2.0
 Group:         Applications/System
 Source0:       https://github.com/dotcloud/docker/archive/v%{version}.tar.gz
-# Source0-md5: ff7b814574bbaf9e55dfe1c266ae991e
+# Source0-md5: 1aedc1fcbb743cd44330a54334db221e
+Source100:     https://raw.github.com/dotcloud/docker/v0.5.3/Makefile
+# Source100-md5:       44cc86a37fc5dfe59596076d346da20d
 Source1:       https://github.com/gorilla/context/archive/master.tar.gz?/gorilla-context.tgz
 # Source1-md5: 621f599f7a49f56ca89c25a6d01ecc3a
 Source2:       https://github.com/gorilla/mux/archive/master.tar.gz?/gorilla-mux.tgz
 # Source2-md5: e908c7da6b4b8b61b4733d4a348f015c
 Source3:       https://github.com/kr/pty/archive/master.tar.gz?/kr-pty.tgz
-# Source3-md5: ffdcacc582c7b6404e71c2dce638869e
+# Source3-md5:        ffdcacc582c7b6404e71c2dce638869e
+Source4:       https://github.com/dotcloud/tar/archive/master.tar.gz?/tar.tgz
+# Source4-md5: 7458ecaa777e56d124b61638d597b37f
+# $ PKG=code.google.com/p/go.net/ REV=84a4013f96e0; hg clone http://$PKG go.net && cd go.net && hg checkout $REV && cd .. && tar -cjf go.net.tar.gz2 --exclude-vcs go.net
+Source5:       go.net.tar.bz2
+# Source5-md5: c8fd9d068430ddfa42d28d4772260eda
 URL:           http://github.com/dotcloud/docker
 BuildRequires: git-core
 BuildRequires: golang >= 1.1
@@ -33,16 +40,22 @@ large-scale web deployments, database clusters, continuous deployment
 systems, private PaaS, service-oriented architectures, etc.
 
 %prep
-%setup -q -n docker-%{version} -a1 -a2 -a3
+%setup -q -n docker-%{version} -a1 -a2 -a3 -a4 -a5
+cp -p %{SOURCE100} .
 
-# handle external deps offline
-install -d .gopath/src/github.com/{gorilla,kr}
+# handle external deps offline, these are taken from Dockerfile
+install -d .gopath/src/github.com/{gorilla,kr,dotcloud}
 # git clone https://github.com/gorilla/context .gopath/src/github.com/gorilla/context
 mv context-master .gopath/src/github.com/gorilla/context
 # git clone https://github.com/gorilla/mux .gopath/src/github.com/gorilla/mux
 mv mux-master .gopath/src/github.com/gorilla/mux
 # git clone https://github.com/kr/pty .gopath/src/github.com/kr/pty
 mv pty-master .gopath/src/github.com/kr/pty
+# git clone https://github.com/dotcloud/tar .gopath/src/github.com/dotcloud/tar
+mv tar-master .gopath/src/github.com/dotcloud/tar
+# PKG=code.google.com/p/go.net/
+install -d .gopath/src/code.google.com/p
+mv go.net .gopath/src/code.google.com/p/go.net
 
 %build
 # avoid interfering with builder env