commit c69d20bf58546134ea72b59d75c89e7274a8977d
Author: Elan Ruusamäe <[email protected]>
Date: Thu Sep 26 19:51:18 2013 +0300
up to 0.6.2; all go deps are vendored
bash-comp-2.patch | 20 --------------------
lxc-docker.spec | 39 ++++++---------------------------------
2 files changed, 6 insertions(+), 53 deletions(-)
---
diff --git a/lxc-docker.spec b/lxc-docker.spec
index 0179403..4f6a576 100644
--- a/lxc-docker.spec
+++ b/lxc-docker.spec
@@ -4,29 +4,17 @@
Summary: Docker: the Linux container engine
Name: lxc-docker
-Version: 0.6.1
-Release: 3
+Version: 0.6.2
+Release: 1
License: Apache v2.0
Group: Applications/System
-Source0: https://github.com/dotcloud/docker/archive/v%{version}.tar.gz
-# Source0-md5: 487262eae6627971e9181886d65fae1a
+Source0:
https://github.com/dotcloud/docker/archive/v%{version}/docker-%{version}.tar.gz
+# Source0-md5: 41df68b4b4f1e03ab1d0964f4b73f440
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
-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
Source6: %{name}.init
-Patch0: bash-comp-2.patch
URL: http://github.com/dotcloud/docker
-BuildRequires: golang >= 1.1
+BuildRequires: golang >= 1.1.2
BuildRequires: rpmbuild(macros) >= 1.228
Requires(post,preun): /sbin/chkconfig
Requires(postun): /usr/sbin/groupdel
@@ -76,23 +64,8 @@ This package provides bash-completion for Docker.
Pakiet ten dostarcza bashowe uzupełnianie nazw dla Dockera.
%prep
-%setup -q -n docker-%{version} -a1 -a2 -a3 -a4 -a5
+%setup -q -n docker-%{version}
cp -p %{SOURCE100} .
-%patch0 -p1
-
-# 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
diff --git a/bash-comp-2.patch b/bash-comp-2.patch
deleted file mode 100644
index 469a7fc..0000000
--- a/bash-comp-2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- docker-0.6.1/contrib/docker.bash~ 2013-08-24 01:23:30.000000000 +0300
-+++ docker-0.6.1/contrib/docker.bash 2013-08-28 10:03:57.739906253 +0300
-@@ -10,6 +10,8 @@
- #
- # To enable the completions either:
- # - place this file in /etc/bash_completion.d
-+# or for bash-completions 2.0
-+# - place this file in /usr/share/bash-completion/completions
- # or
- # - copy this file and add the line below to your .bashrc after
- # bash completion features are loaded
-@@ -21,7 +23,7 @@
- # If the docker daemon is using a unix socket for communication your user
- # must have access to the socket for the completions to function correctly
-
--have docker && {
-+_have docker && {
- __docker_containers_all()
- {
- local containers
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lxc-docker.git/commitdiff/c69d20bf58546134ea72b59d75c89e7274a8977d
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
