commit 67158db2bf07add9420d8762984b12f0f51fba3e
Author: Lokesh Mandvekar <l...@redhat.com>
Date: Wed Oct 30 12:07:29 2013 -0500
docker-io dm branch packaged
Signed-off-by: Lokesh Mandvekar <l...@redhat.com>
.gitignore | 1 +
docker-io.spec | 15 +++++++++------
sources | 2 +-
3 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b5a09d6..70db3fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/docker-0.7-rc2.zip
/docker-0.7-rc3.zip
/docker-3c20a8c.tar.gz
+/docker-1fe08e0.tar.gz
diff --git a/docker-io.spec b/docker-io.spec
index 4684fb6..7eeedf2 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -6,12 +6,12 @@
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit 3c20a8cdc7b1b323696c5720c23480971f55ccef
+%global commit 1fe08e004686b25aaf56bc01194629c0b7e658f9
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
Version: 0.7
-Release: 0.11.rc4%{?dist}
+Release: 0.12.dm%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
@@ -29,7 +29,6 @@ BuildRequires: gcc
BuildRequires: golang(github.com/gorilla/mux)
BuildRequires: golang(github.com/kr/pty)
BuildRequires: golang(code.google.com/p/go.net/websocket)
-BuildRequires: golang(code.google.com/p/gosqlite/sqlite3)
BuildRequires: device-mapper-devel
BuildRequires: python-sphinxcontrib-httpdomain
%if %{with systemd}
@@ -70,7 +69,7 @@ export GOPATH=$(pwd):%{gopath}
# passing version information build flags BZ #1017186
export LDFLAGS="-X main.GITCOMMIT %{shortcommit}/%{release} -X main.VERSION
%{version} -w"
go build -v -a -ldflags "$LDFLAGS" github.com/dotcloud/docker/docker
-go build -v -a github.com/dotcloud/docker/dockerinit
+go build -v -a -ldflags "$LDFLAGS" github.com/dotcloud/docker/docker-init
popd
@@ -83,7 +82,7 @@ install -d %{buildroot}%{_sysconfdir}/bash_completion.d
install -d %{buildroot}%{_datadir}/zsh/site-functions
install -d -m 700 %{buildroot}%{_sharedstatedir}/docker
install -p -m 755 _build/docker %{buildroot}%{_bindir}
-install -p -m 755 _build/dockerinit %{buildroot}%{_bindir}
+install -p -m 755 _build/docker-init %{buildroot}%{_bindir}
install -p -m 644 docs/_build/man/docker.1 %{buildroot}%{_mandir}/man1
install -p -m 644 contrib/completion/bash/docker
%{buildroot}%{_sysconfdir}/bash_completion.d/docker.bash
install -p -m 644 contrib/completion/zsh/_docker
%{buildroot}%{_datadir}/zsh/site-functions
@@ -123,7 +122,7 @@ fi
%doc AUTHORS CHANGELOG.md CONTRIBUTING.md FIXME LICENSE MAINTAINERS NOTICE
README.md
%{_mandir}/man1/docker.1.gz
%{_bindir}/docker
-%{_bindir}/dockerinit
+%{_bindir}/docker-init
%if %{with systemd}
%{_unitdir}/docker.service
%else
@@ -135,6 +134,10 @@ fi
%dir %{_sharedstatedir}/docker
%changelog
+* Sat Oct 26 2013 Lokesh Mandvekar <l...@redhat.com> - 0.7-0.12.dm
+- dm branch
+- dockerinit -> docker-init
+
* Tue Oct 22 2013 Lokesh Mandvekar <l...@redhat.com> - 0.7-0.11.rc4
- passing version information for docker build BZ #1017186
diff --git a/sources b/sources
index 40e9002..79e1d1c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6270e0479104f926eacc6610864b6c92 docker-3c20a8c.tar.gz
+cdf369c927a18663046fa44f4480e739 docker-1fe08e0.tar.gz
_______________________________________________
golang mailing list
golang@lists.fedoraproject.org
https://lists.fedoraproject.org/mailman/listinfo/golang
