[kubernetes] Bump to upstream a4abafea02babc529c9b5b9c825ba0bb3eec74c6
by Eric Paris
commit a933945d26b33bb8035ffd1573b2ea5d431a0157
Author: Eric Paris <eparis(a)redhat.com>
Date: Mon Nov 3 16:41:22 2014 -0500
Bump to upstream a4abafea02babc529c9b5b9c825ba0bb3eec74c6
.gitignore | 2 ++
kubernetes.spec | 9 ++++++---
sources | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2ab6ce2..6a8cf60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@
/kubernetes-8e1d416.tar.gz
/kubernetes-78df011.tar.gz
/kubernetes-a18cdac.tar.gz
+/kubernetes-808be2d.tar.gz
+/kubernetes-a4abafe.tar.gz
diff --git a/kubernetes.spec b/kubernetes.spec
index 3307222..45593c0 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 808be2d13b7bf14a3cf6985bc7c9d02f48a3d1e0
+%global commit a4abafea02babc529c9b5b9c825ba0bb3eec74c6
%global shortcommit %(c=%{commit}; echo ${c:0:7})
#binaries which should be called kube-*
@@ -18,7 +18,7 @@
Name: kubernetes
Version: 0.4
-Release: 453.0.git%{shortcommit}%{?dist}
+Release: 477.0.git%{shortcommit}%{?dist}
Summary: Container cluster management
License: ASL 2.0
URL: https://github.com/GoogleCloudPlatform/kubernetes
@@ -84,7 +84,7 @@ BuildRequires: golang(gopkg.in/v1/yaml)
%build
export KUBE_GIT_COMMIT=%{commit}
export KUBE_GIT_TREE_STATE="dirty"
-export KUBE_GIT_VERSION=v0.4-453-g808be2d13b7bf1
+export KUBE_GIT_VERSION=v0.4-477-ga4abafea02babc
export KUBE_EXTRA_GOPATH=%{gopath}
export KUBE_NO_GODEPS="true"
@@ -201,6 +201,9 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
%systemd_postun
%changelog
+* Mon Nov 03 2014 Eric Paris <eparis(a)redhat.com - 0.4-477.0.gita4abafe
+- Bump to upstream a4abafea02babc529c9b5b9c825ba0bb3eec74c6
+
* Mon Nov 03 2014 Eric Paris <eparis(a)redhat.com - 0.4-453.0.git808be2d
- Bump to upstream 808be2d13b7bf14a3cf6985bc7c9d02f48a3d1e0
- Includes upstream change to remove --machines from the APIServer
diff --git a/sources b/sources
index 08eacc9..5792a32 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5f57bef6ebb85f15b207c99327222413 kubernetes-a18cdac.tar.gz
+ecf908d44ea5837341c768a980111b86 kubernetes-a4abafe.tar.gz
9 years, 5 months
[kubernetes] forgot sources
by Eric Paris
commit 8a9f2b7b653511f38ade319cdaedad99e0397dc6
Author: Eric Paris <eparis(a)redhat.com>
Date: Mon Nov 3 16:34:25 2014 -0500
forgot sources
9 years, 5 months
[kubernetes] Bump to upstream 808be2d13b7bf14a3cf6985bc7c9d02f48a3d1e0
by Eric Paris
commit b196e11694928fccae621c670eff3c48f12e1ce4
Author: Eric Paris <eparis(a)redhat.com>
Date: Mon Nov 3 16:33:41 2014 -0500
Bump to upstream 808be2d13b7bf14a3cf6985bc7c9d02f48a3d1e0
- Includes upstream change to remove --machines from the APIServer
- Port to new build system
- Start running %check tests again
getsource.sh | 3 +--
kubernetes.spec | 41 +++++++++++++++++++++++++++--------------
2 files changed, 28 insertions(+), 16 deletions(-)
---
diff --git a/getsource.sh b/getsource.sh
index 17d8b1d..ea692b2 100755
--- a/getsource.sh
+++ b/getsource.sh
@@ -11,12 +11,11 @@ SPEC=kubernetes.spec
wget https://github.com/GoogleCloudPlatform/kubernetes/archive/${KUBE_GIT_COMM...
-
+since_tag=0
if [[ "${KUBE_GIT_VERSION}" =~ ^v([0-9]+)\.([0-9]+)\-([0-9]+)\-(.*)?$ ]]; then
git_major=${BASH_REMATCH[1]}
git_minor=${BASH_REMATCH[2]}
if [[ -n "${BASH_REMATCH[3]}" ]]; then
- git_minor+="+"
since_tag=${BASH_REMATCH[3]}
fi
fi
diff --git a/kubernetes.spec b/kubernetes.spec
index c9b50af..3307222 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 a18cdac616962a2c486feb22afa3538fc3cf3a3a
+%global commit 808be2d13b7bf14a3cf6985bc7c9d02f48a3d1e0
%global shortcommit %(c=%{commit}; echo ${c:0:7})
#binaries which should be called kube-*
@@ -17,8 +17,8 @@
%global _checkshell /bin/bash
Name: kubernetes
-Version: 0.4+
-Release: 426.0.git%{shortcommit}%{?dist}
+Version: 0.4
+Release: 453.0.git%{shortcommit}%{?dist}
Summary: Container cluster management
License: ASL 2.0
URL: https://github.com/GoogleCloudPlatform/kubernetes
@@ -84,34 +84,38 @@ BuildRequires: golang(gopkg.in/v1/yaml)
%build
export KUBE_GIT_COMMIT=%{commit}
export KUBE_GIT_TREE_STATE="dirty"
-export KUBE_GIT_VERSION=v0.4-426-ga18cdac616962a
+export KUBE_GIT_VERSION=v0.4-453-g808be2d13b7bf1
export KUBE_EXTRA_GOPATH=%{gopath}
export KUBE_NO_GODEPS="true"
-. hack/config-go.sh
+. hack/lib/init.sh
+kube::golang::setup_env
-kube::setup_go_environment
+version_ldflags=$(kube::version::ldflags)
-version_ldflags=$(kube::version_ldflags)
+targets=("${KUBE_ALL_TARGETS[@]}")
+binaries=($(kube::golang::binaries_from_targets "${targets[@]}"))
-targets=($(kube::default_build_targets))
-targets+=("cmd/integration")
-binaries=($(kube::binaries_from_targets "${targets[@]}"))
+platform="$(kube::golang::host_platform)"
+kube::golang::set_platform_envs "${platform}"
for binary in ${binaries[@]}; do
bin=$(basename "${binary}")
- echo "+++ Building ${bin}"
- go build -o "${KUBE_TARGET}/bin/${bin}" \
+ output_path="${KUBE_GOPATH}/bin/"
+ go build -o "${output_path}/${bin}" \
"${goflags[@]:+${goflags[@]}}" \
-ldflags "${version_ldflags}" \
"${binary}"
done
+kube::golang::place_bins
+
%check
export KUBE_EXTRA_GOPATH=%{gopath}
export KUBE_NO_GODEPS="true"
export KUBE_NO_BUILD_INTEGRATION="true"
+
echo "******Testing the commands*****"
hack/test-cmd.sh
# In Fedora 20 and RHEL7 the go cover tools isn't available correctly
@@ -125,14 +129,19 @@ echo "******Benchmarking kube********"
hack/benchmark-go.sh
%install
+. hack/lib/init.sh
+kube::golang::setup_env
+
+output_path="${KUBE_OUTPUT_BINPATH}/$(kube::golang::current_platform)"
+
install -m 755 -d %{buildroot}%{_bindir}
for bin in %{prefixed_binaries}; do
echo "+++ INSTALLING ${bin}"
- install -p -m 755 _output/go/bin/${bin} %{buildroot}%{_bindir}/kube-${bin}
+ install -p -m 755 ${output_path}/${bin} %{buildroot}%{_bindir}/kube-${bin}
done
for bin in %{nonprefixed_binaries}; do
echo "+++ INSTALLING ${bin}"
- install -p -m 755 _output/go/bin/${bin} %{buildroot}%{_bindir}/${bin}
+ install -p -m 755 ${output_path}/${bin} %{buildroot}%{_bindir}/${bin}
done
# install the bash completion
@@ -192,6 +201,10 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
%systemd_postun
%changelog
+* Mon Nov 03 2014 Eric Paris <eparis(a)redhat.com - 0.4-453.0.git808be2d
+- Bump to upstream 808be2d13b7bf14a3cf6985bc7c9d02f48a3d1e0
+- Includes upstream change to remove --machines from the APIServer
+- Port to new build system
- Start running %check tests again
* Fri Oct 31 2014 Eric Paris <eparis(a)redhat.com - 0.4+-426.0.gita18cdac
9 years, 5 months
[kubernetes] run %check tests at build time
by Eric Paris
commit 6d7725ea53d832d6fe939e2038fce060ba0a2014
Author: Eric Paris <eparis(a)redhat.com>
Date: Fri Oct 31 10:31:36 2014 -0400
run %check tests at build time
kubernetes.spec | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/kubernetes.spec b/kubernetes.spec
index ce01f96..c9b50af 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -112,7 +112,6 @@ done
export KUBE_EXTRA_GOPATH=%{gopath}
export KUBE_NO_GODEPS="true"
export KUBE_NO_BUILD_INTEGRATION="true"
-exit
echo "******Testing the commands*****"
hack/test-cmd.sh
# In Fedora 20 and RHEL7 the go cover tools isn't available correctly
@@ -193,6 +192,8 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
%systemd_postun
%changelog
+- Start running %check tests again
+
* Fri Oct 31 2014 Eric Paris <eparis(a)redhat.com - 0.4+-426.0.gita18cdac
- Bump to upstream a18cdac616962a2c486feb22afa3538fc3cf3a3a
9 years, 5 months
[docker-io/el6] update to v1.3.1
by Lokesh Mandvekar
commit fc72a0709f82ae44bbe95fab6ea236bb59f0419f
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Fri Oct 31 13:42:36 2014 -0700
update to v1.3.1
NVR: docker-io-1.3.1-2
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Conflicts:
docker-io.spec
docker-io.spec | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 3ba8907..2927282 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -13,12 +13,12 @@
%global commit c78088fe3d1b90640c637d8c3457de3caa0c7a24
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-Name: docker-io
-Version: 1.3.0
-Release: 1%{?dist}
-Summary: Automates deployment of containerized applications
-License: ASL 2.0
-URL: http://www.docker.com
+Name: %{repo}-io
+Version: 1.3.1
+Release: 2%{?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://github.com/docker/docker/archive/v%{version}.tar.gz
@@ -29,10 +29,8 @@ Source2: docker-storage.sysconfig
# have init script wait up to 5 mins before forcibly terminating docker daemon
# https://github.com/docker/docker/commit/640d2ef6f54d96ac4fc3f0f745cb1e6a3...
Source3: docker.sysvinit
-Patch0: ipmasq.patch
BuildRequires: glibc-static
-BuildRequires: pandoc
-BuildRequires: golang >= 1.3
+BuildRequires: golang >= 1.3.3
# for gorilla/mux and kr/pty https://github.com/dotcloud/docker/pull/5950
BuildRequires: golang(github.com/gorilla/mux) >= 0-0.13
BuildRequires: golang(github.com/kr/pty) >= 0-0.19
@@ -43,10 +41,11 @@ 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) >= 1.2.0-2
+BuildRequires: golang(github.com/docker/libcontainer) >= 1.2.0
BuildRequires: golang(github.com/tchap/go-patricia/patricia)
BuildRequires: golang(github.com/docker/libtrust)
BuildRequires: golang(github.com/docker/libtrust/trustgraph)
+BuildRequires: go-md2man
BuildRequires: device-mapper-devel
Requires(post): chkconfig
Requires(preun): chkconfig
@@ -160,8 +159,6 @@ rm -rf vendor
find . -name "*.go" \
-print |\
xargs sed -i 's/github.com\/docker\/docker\/vendor\/src\/code.google.com\/p\/go\/src\/pkg\///g'
-sed -i 's/go-md2man -in "$FILE" -out/pandoc -s -t man "$FILE" -o/g' docs/man/md2man-all.sh
-%patch0 -p1
%build
# set up temporary build gopath, and put our directory there
@@ -325,7 +322,13 @@ fi
%{gopath}/src/%{import_path}/pkg/*/*/*/*.tar
%changelog
-* Fri Oct 24 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.0-1
+* Fri Oct 31 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.1-2
+- Remove pandoc from build reqs
+
+* Fri Oct 31 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.1-1
+- update to v1.3.1
+
+* Mon Oct 20 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.0-1
- Resolves: rhbz#1153936 - update to v1.3.0
- iptables=false => ip-masq=false
9 years, 5 months
[golang-github-docker-libtrust/el6: 2/2] exclusivearch for el6
by Lokesh Mandvekar
commit 30b955b16d7af9f3d140e7d7b9e80fe4f7b33210
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Mon Nov 3 10:54:34 2014 -0800
exclusivearch for el6
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
golang-github-docker-libtrust.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/golang-github-docker-libtrust.spec b/golang-github-docker-libtrust.spec
index b890009..681b5ae 100644
--- a/golang-github-docker-libtrust.spec
+++ b/golang-github-docker-libtrust.spec
@@ -14,7 +14,7 @@ Summary: Library for managing authentication and authorization
License: ASL 2.0
URL: https://%{import_path}
Source0: https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-BuildArch: noarch
+ExclusiveArch: %{ix86} x86_64 %{arm}
%description
%{summary}.
9 years, 5 months