[docker-io/f21] Revert to upstream v1.3.2 release
by Lokesh Mandvekar
commit 32fc1c322f76185ac198a8bbb6b559e8659c7f29
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Mon Dec 1 20:25:28 2014 -0800
Revert to upstream v1.3.2 release
NVR: docker-io-1.3.2-4
1.3.2-3.git suffers from bugs
rhbz#1169593, rhbz#1169151 and rhbz#1169334
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
docker-io.spec | 17 +++++++++--------
sources | 2 +-
2 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 47d136f..be29354 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -11,19 +11,18 @@
%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: 3.git%{shortcommit}%{?dist}
+Release: 4%{?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
Source1: %{repo}.service
Source2: %{repo}.sysconfig
Source3: %{repo}-storage.sysconfig
@@ -179,7 +178,6 @@ Provides: golang(%{import_path}/pkg/testutils) = %{version}-%{release}
Provides: golang(%{import_path}/pkg/timeutils) = %{version}-%{release}
Provides: golang(%{import_path}/pkg/truncindex) = %{version}-%{release}
Provides: golang(%{import_path}/pkg/units) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/urlutil) = %{version}-%{release}
Provides: golang(%{import_path}/pkg/version) = %{version}-%{release}
%description pkg-devel
@@ -190,7 +188,7 @@ specific logic.
The import paths of import_path/pkg/...
%prep
-%setup -qn %{repo}-%{commit}
+%setup -qn %{repo}-%{version}
rm -rf vendor/src/github.com/{coreos,godbus,gorilla,kr,Sirupsen,syndtr,tchap}
find . -name "*.go" \
-print |\
@@ -214,11 +212,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
@@ -313,6 +311,9 @@ exit 0
%{gopath}/src/%{import_path}/pkg/*
%changelog
+* Mon Dec 01 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.2-4
+- Revert to using upstream v1.3.2 release
+
* Sun Nov 30 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.2-3.git353ff40
- Resolves: rhbz#1169035, rhbz#1169151
- bring back golang deps (except libcontainer)
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
9 years, 4 months
[kubernetes] Bump to upstream 6aabd9804fb75764b70e9172774002d4febcae34
by Eric Paris
commit 80f87bf1a76f560f3330a283ba68e56db1155f74
Author: Eric Paris <eparis(a)redhat.com>
Date: Mon Dec 1 13:03:48 2014 -0500
Bump to upstream 6aabd9804fb75764b70e9172774002d4febcae34
.gitignore | 1 +
kubernetes.spec | 9 ++++++---
sources | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 15308cb..46589e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
/kubernetes-162e498.tar.gz
/kubernetes-64e07f7.tar.gz
/kubernetes-ff1e9f4.tar.gz
+/kubernetes-6aabd98.tar.gz
diff --git a/kubernetes.spec b/kubernetes.spec
index 3fadbab..21ee75a 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -1,7 +1,7 @@
#debuginfo not supported with Go
%global debug_package %{nil}
%global import_path github.com/GoogleCloudPlatform/kubernetes
-%global commit ff1e9f4c191342c24974c030e82aceaff8ea9c24
+%global commit 6aabd9804fb75764b70e9172774002d4febcae34
%global shortcommit %(c=%{commit}; echo ${c:0:7})
#I really need this, otherwise "version_ldflags=$(kube::version_ldflags)"
@@ -11,7 +11,7 @@
Name: kubernetes
Version: 0.5
-Release: 210.0.git%{shortcommit}%{?dist}
+Release: 235.0.git%{shortcommit}%{?dist}
Summary: Container cluster management
License: ASL 2.0
URL: https://github.com/GoogleCloudPlatform/kubernetes
@@ -81,7 +81,7 @@ BuildRequires: golang(gopkg.in/v1/yaml)
%build
export KUBE_GIT_TREE_STATE="clean"
export KUBE_GIT_COMMIT=%{commit}
-export KUBE_GIT_VERSION=v0.5-210-gff1e9f4c191342
+export KUBE_GIT_VERSION=v0.5-235-g6aabd9804fb757
%if 0%{?fedora}
export KUBE_GIT_TREE_STATE="dirty"
@@ -180,6 +180,9 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
%systemd_postun
%changelog
+* Mon Dec 01 2014 Eric Paris <eparis(a)redhat.com> - 0.5-235.0.git6aabd98
+- Bump to upstream 6aabd9804fb75764b70e9172774002d4febcae34
+
* Wed Nov 26 2014 Eric Paris <eparis(a)redhat.com> - 0.5-210.0.gitff1e9f4
- Bump to upstream ff1e9f4c191342c24974c030e82aceaff8ea9c24
diff --git a/sources b/sources
index 92cbe41..8cff684 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d4e2c2cf9a65d63408d3628de042eb6c kubernetes-ff1e9f4.tar.gz
+96abb05fe028f4c528a99bdb6897c7a4 kubernetes-6aabd98.tar.gz
9 years, 4 months