[packages/lxc-docker] handle external deps offline

glen glen at pld-linux.org
Wed Aug 21 23:53:53 CEST 2013


commit a0edb644bcc8a1179c0754a023ec7185f5bce890
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Aug 22 00:36:59 2013 +0300

    handle external deps offline

 lxc-docker.spec | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)
---
diff --git a/lxc-docker.spec b/lxc-docker.spec
index 6c7dade..c24b59c 100644
--- a/lxc-docker.spec
+++ b/lxc-docker.spec
@@ -1,8 +1,3 @@
-# TODO:
-# - handle network downloads:
-#  - github.com/gorilla/mux (download)
-#  - github.com/gorilla/context (download)
-#  - github.com/kr/pty (download)
 Summary:	Docker: the Linux container engine
 Name:		lxc-docker
 Version:	0.5.3
@@ -11,7 +6,14 @@ License:	Apache v2.0
 Group:		Applications/System
 Source0:	https://github.com/dotcloud/docker/archive/v%{version}.tar.gz
 # Source0-md5:	ff7b814574bbaf9e55dfe1c266ae991e
+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
 URL:		http://github.com/dotcloud/docker
+BuildRequires:	git-core
 BuildRequires:	golang >= 1.1
 Requires:	lxc
 Requires:	uname(release) >= 3.8
@@ -27,9 +29,21 @@ large-scale web deployments, database clusters, continuous deployment
 systems, private PaaS, service-oriented architectures, etc.
 
 %prep
-%setup -q -n docker-%{version}
+%setup -q -n docker-%{version} -a1 -a2 -a3
+
+# handle external deps offline
+install -d .gopath/src/github.com/{gorilla,kr}
+# 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
 
 %build
+# avoid interfering with builder env
+unset GIT_WORK_TREE
+unset GIT_DIR
 %{__make} VERBOSE=1
 
 %install
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lxc-docker.git/commitdiff/a0edb644bcc8a1179c0754a023ec7185f5bce890



More information about the pld-cvs-commit mailing list