commit 9c2220a293f2d3664f9ead912e4b9eeee8540cb6
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Mon Dec 8 23:06:28 2014 +0000
Revert to upstream release 1.3.2
NVR: docker-io-1.3.2-5
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
docker-io.spec | 20 +++---
initialize-db.patch | 152 ---------------------------------------------------
sources | 2 +-
3 files changed, 11 insertions(+), 163 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 7cd775e..b0fc207 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -10,24 +10,22 @@
%global repo %{project}
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
-# This commit resolves rhbz#1169151
-%global commit 353ff40181276a0278b323e569cc887d0510ae69
+%global commit 39fa2faad2f3d6fa5133de4eb740677202f53ef4
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: %{repo}-io
Version: 1.3.2
-Release: 4.git%{shortcommit}%{?dist}
+Release: 5%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
URL:
http://www.docker.com
# only x86_64 for now:
https://github.com/docker/docker/issues/136
ExclusiveArch: x86_64
-#Source0: https://%{import_path}/archive/v%{version}.tar.gz
-Source0: https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+Source0: https://%{import_path}/archive/v%{version}.tar.gz
+#Source0: https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
Source1: %{repo}.service
Source2: %{repo}.sysconfig
Source3: %{repo}-storage.sysconfig
-Patch0: initialize-db.patch
BuildRequires: glibc-static
BuildRequires: golang >= 1.3.3
# for gorilla/mux and kr/pty
https://github.com/dotcloud/docker/pull/5950
@@ -191,8 +189,7 @@ specific logic.
The import paths of import_path/pkg/...
%prep
-%setup -qn %{repo}-%{commit}
-%patch0 -p1
+%setup -qn %{repo}-%{version}
rm -rf
vendor/src/github.com/{coreos,godbus,gorilla,kr,Sirupsen,syndtr,tchap}
find . -name "*.go" \
-print |\
@@ -216,11 +213,11 @@ cp contrib/syntax/vim/README.md README-vim-syntax.md
%install
# install binary
install -d %{buildroot}%{_bindir}
-install -p -m 755 bundles/%{version}-dev/dynbinary/docker-%{version}-dev
%{buildroot}%{_bindir}/docker
+install -p -m 755 bundles/%{version}/dynbinary/docker-%{version}
%{buildroot}%{_bindir}/docker
# install dockerinit
install -d %{buildroot}%{_libexecdir}/docker
-install -p -m 755 bundles/%{version}-dev/dynbinary/dockerinit-%{version}-dev
%{buildroot}%{_libexecdir}/docker/dockerinit
+install -p -m 755 bundles/%{version}/dynbinary/dockerinit-%{version}
%{buildroot}%{_libexecdir}/docker/dockerinit
# install manpages
install -d %{buildroot}%{_mandir}/man1
@@ -315,6 +312,9 @@ exit 0
%{gopath}/src/%{import_path}/pkg/*
%changelog
+* Mon Dec 08 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.2-5
+- Revert to using upstream release 1.3.2
+
* Tue Dec 02 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.2-4.git353ff40
- Resolves: rhbz#1169151, rhbz#1169334
diff --git a/sources b/sources
index 633ad1a..bf5a889 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9be26edc11a06d5964d78f58e5293e4f docker-353ff40.tar.gz
+09af621b62626dd18a2f2994435236ca v1.3.2.tar.gz