[docker-io/el6] Resolves: rhbz#1124036 - update to v1.1.2

lsm5 lsm5 at fedoraproject.org
Fri Aug 1 22:16:06 UTC 2014


commit 1b982bc7c7d6b96c15150411d1bcae3475b07c4b
Author: Lokesh Mandvekar <lsm5 at fedoraproject.org>
Date:   Fri Aug 1 17:11:41 2014 -0500

    Resolves: rhbz#1124036 - update to v1.1.2
    
    This update is built using libcontainer directly from the vendor dir,
    on account of some errors in getting libcontainer built for el6 (which in
    turn depended on docker-io-pkg-devel)
    
    *This is only a one-time hack*.

 docker-io.spec |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 9b223dc..41be23c 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -40,7 +40,7 @@ BuildRequires:  golang(code.google.com/p/go.net/websocket)
 BuildRequires:  golang(code.google.com/p/gosqlite/sqlite3)
 # RHBZ#1109039 use syndtr/gocapability >= 0-0.7
 BuildRequires:  golang(github.com/syndtr/gocapability/capability) >= 0-0.7
-BuildRequires:  golang(github.com/docker/libcontainer)
+#BuildRequires:  golang(github.com/docker/libcontainer)
 BuildRequires:  golang(github.com/tchap/go-patricia/patricia)
 BuildRequires:  device-mapper-devel
 Requires(post):     chkconfig
@@ -156,7 +156,7 @@ The import paths of %{import_path}/pkg/...
 
 %prep
 %setup -q -n docker-%{version}
-rm -rf vendor
+#rm -rf vendor
 %patch1 -p1 -F 2 -b upstream-patched-archive-tar
 %patch2 -p1 -F 2
 cp -p %{SOURCE1} contrib/init/sysvinit-redhat/docker.sysconfig
@@ -169,7 +169,7 @@ ln -s $(pwd) ./_build/src/github.com/dotcloud/docker
 
 export DOCKER_GITCOMMIT="%{shortcommit}/%{version}"
 #export DOCKER_BUILDTAGS='selinux'
-export GOPATH=$(pwd)/_build:%{gopath}
+export GOPATH=$(pwd)/_build:$(pwd)/vendor
 export DOCKER_BUILDTAGS='exclude_graphdriver_btrfs'
 
 hack/make.sh dynbinary


More information about the scm-commits mailing list