X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=lxc-docker.spec;h=eb3d99e32e89aa737c1693054d8a76cda66e5aed;hb=acc70642337670958475b8a775b63758d0d79c13;hp=4f6a57645dcf0adcf8280edf17b7b6c678870247;hpb=c69d20bf58546134ea72b59d75c89e7274a8977d;p=packages%2Fdocker.git

diff --git a/lxc-docker.spec b/lxc-docker.spec
index 4f6a576..eb3d99e 100644
--- a/lxc-docker.spec
+++ b/lxc-docker.spec
@@ -4,14 +4,12 @@
 
 Summary:	Docker: the Linux container engine
 Name:		lxc-docker
-Version:	0.6.2
+Version:	0.6.3
 Release:	1
 License:	Apache v2.0
 Group:		Applications/System
 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
+# Source0-md5:	7926f24106b4299ffbb669d42fd7e375
 Source6:	%{name}.init
 URL:		http://github.com/dotcloud/docker
 BuildRequires:	golang >= 1.1.2
@@ -65,22 +63,20 @@ Pakiet ten dostarcza bashowe uzupełnianie nazw dla Dockera.
 
 %prep
 %setup -q -n docker-%{version}
-cp -p %{SOURCE100} .
 
-%build
-# avoid interfering with builder env
-unset GIT_WORK_TREE
-unset GIT_DIR
-%{__make} VERBOSE=1
+install -d vendor/src/github.com/dotcloud
+ln -s $(pwd) vendor/src/github.com/dotcloud/docker
 
-%if %{with tests}
-%{__make} test
-%endif
+%build
+export GOPATH=$(pwd)/vendor
+install -d build
+cd build
+go build -v -a github.com/dotcloud/docker/docker
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,/etc/rc.d/init.d,/var/lib/docker/{containers,graph,volumes}}
-install -p bin/docker $RPM_BUILD_ROOT%{_bindir}/lxc-docker
+install -p build/docker $RPM_BUILD_ROOT%{_bindir}/lxc-docker
 install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/lxc-docker
 ln -s lxc-docker $RPM_BUILD_ROOT%{_bindir}/docker
 cp -p packaging/debian/lxc-docker.1 $RPM_BUILD_ROOT%{_mandir}/man1