[kubernetes] Bump to upstream a8f2cee8c5418676ee33a311fad57d6821d3d29a
commit cf16ac28bb7fc011b998f0c77502faff41a2884f
Author: Jan Chaloupka jchal...@redhat.com
Date: Fri Mar 20 10:25:16 2015 +0100
Bump to upstream a8f2cee8c5418676ee33a311fad57d6821d3d29a
.gitignore | 1 +
kubernetes.spec | 9 ++---
sources | 1 +
3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bd87ba5..138c36d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/kubernetes-53b25a7.tar.gz
+/kubernetes-a8f2cee.tar.gz
diff --git a/kubernetes.spec b/kubernetes.spec
index 7743331..0213c5e 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -5,7 +5,7 @@
%global projectGoogleCloudPlatform
%global repo kubernetes
%global import_path%{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit 53b25a7890e31bdec6f2a95b32200d6cc27ae2ca
+%global commit a8f2cee8c5418676ee33a311fad57d6821d3d29a
%global shortcommit%(c=%{commit}; echo ${c:0:7})
#I really need this, otherwise version_ldflags=$(kube::version_ldflags)
@@ -14,8 +14,8 @@
%global _checkshell/bin/bash
Name: kubernetes
-Version: 0.12.0
-Release: 0.9.git%{shortcommit}%{?dist}
+Version: 0.13.2
+Release: 0.1.git%{shortcommit}%{?dist}
Summary: Container cluster management
License: ASL 2.0
URL: https://github.com/GoogleCloudPlatform/kubernetes
@@ -430,6 +430,9 @@ getent passwd kube /dev/null || useradd -r -g kube -d / -s
/sbin/nologin \
%systemd_postun
%changelog
+* Fri Mar 20 2015 jchaloup jchal...@redhat.com - 0.13.2-0.1.gita8f2cee
+- Bump to upstream a8f2cee8c5418676ee33a311fad57d6821d3d29a
+
* Fri Mar 13 2015 jchaloup jchal...@redhat.com - 0.12.0-0.9.git53b25a7
- Bump to upstream 53b25a7890e31bdec6f2a95b32200d6cc27ae2ca
fix kube-proxy.service and kubelet
diff --git a/sources b/sources
index c81782f..9738c30 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
65ca9d5b270e3bb01775a0198c7a65cb kubernetes-53b25a7.tar.gz
+3c07648a40731a8a8bcf1190a78d1000 kubernetes-a8f2cee.tar.gz
___
golang mailing list
golang@lists.fedoraproject.org
https://lists.fedoraproject.org/mailman/listinfo/golang
[docker-io] add docker-selinux subpackage
commit cb9bd360118860ede63cfffd80b1e52f1fbae747
Author: Lokesh Mandvekar l...@fedoraproject.org
Date: Tue Mar 17 08:25:50 2015 -0500
add docker-selinux subpackage
- Add files to relabel when installing docker-selinux package
- Set minimal selinux-policy version
From: Lukas Vrabec lvra...@redhat.com
- also, cosmetic changes
From: Lokesh Mandvekar l...@fedoraproject.org
Signed-off-by: Lokesh Mandvekar l...@fedoraproject.org
docker-io.spec | 193 +
1 file changed, 141 insertions(+), 52 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 334e6a5..68931f2 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -3,54 +3,80 @@
# docker builds in a checksum of dockerinit into docker,
# so stripping the binaries breaks docker
-%global debug_package %{nil}
-%global providergithub
-%global provider_tldcom
-%global project docker
-%global repo%{project}
+%global debug_package %{nil}
+%global provider github
+%global provider_tld com
+%global project docker
+%global repo %{project}
-%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
+%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit 5ebfacda4747fb0b2473841dff9b9b771b3bcb53
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+# docker stuff (prefix with d_)
+%global d_commit 5ebfacda4747fb0b2473841dff9b9b771b3bcb53
+%global d_shortcommit %(c=%{d_commit}; echo ${c:0:7})
%global tar_import_path code.google.com/p/go/src/pkg/archive/tar
-Name: %{repo}-io
-Version: 1.5.0
-Release: 20.git%{shortcommit}%{?dist}
-Summary:Automates deployment of containerized applications
-License:ASL 2.0
-URL:http://www.docker.com
-ExclusiveArch: x86_64 %{arm}
-#Source0:
https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-Source0:
https://github.com/lsm5/docker/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-Source1:%{repo}.service
-Source2:%{repo}.sysconfig
-Source3:%{repo}-storage.sysconfig
-Source4:%{repo}-logrotate.sh
-Source5:README.%{repo}-logrotate
-Source6:%{repo}-network.sysconfig
-BuildRequires: glibc-static
-BuildRequires: golang = 1.3.3
-BuildRequires: go-md2man
-BuildRequires: device-mapper-devel
-BuildRequires: btrfs-progs-devel
-BuildRequires: sqlite-devel
-BuildRequires: pkgconfig(systemd)
+# docker-selinux stuff (prefix with ds_ for version/release etc.)
+# Some bits borrowed from the openstack-selinux package
+%global ds_version 0
+%global ds_commit 4421e0d80866b4b03f6a16c5b6bfabdf4c8bfa7c
+%global ds_shortcommit %(c=%{ds_commit}; echo ${c:0:7})
+%global selinuxtype targeted
+%global moduletype services
+%global modulenames %{repo}
+
+# Usage: _format var format
+# Expand 'modulenames' into various formats as needed
+# Format must contain '$x' somewhere to do anything useful
+%global _format() export %1=; for x in %{modulenames}; do %1+=%2; %1+= ;
done;
+
+# Relabel files
+%global relabel_files() \
+/sbin/restorecon -R %{_bindir}/docker %{_localstatedir}/run/docker.sock
%{_localstatedir}/run/docker.pid %{_sharedstatedir}/docker
%{_sysconfdir}/docker %{_localstatedir}/log/docker %{_localstatedir}/log/lxc
%{_localstatedir}/lock/lxc %{_usr}/lib/systemd/system/docker.service
/root/.docker /dev/null || : \
+
+
+# Version of SELinux we were using
+%global selinux_policyver 3.13.1-119
+
+Name: %{repo}-io
+Version: 1.5.0
+Release: 21.git%{d_shortcommit}%{?dist}
+Summary: Automates deployment of containerized applications
+License: ASL 2.0
+URL: http://www.docker.com
+ExclusiveArch: x86_64 %{arm}
+#Source0:
https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+Source0:
https://github.com/lsm5/%{repo}/archive/%{d_commit}/%{repo}-%{d_shortcommit}.tar.gz
+Source1: %{repo}.service
+Source2: %{repo}.sysconfig
+Source3: %{repo}-storage.sysconfig
+Source4: %{repo}-logrotate.sh
+Source5: README.%{repo}-logrotate
+Source6: %{repo}-network.sysconfig
+Source7:
https://github.com/wrabcak/%{repo}-selinux/archive/%{ds_commit}/%{repo}-selinux-%{ds_shortcommit}.tar.gz
+BuildRequires: glibc-static
+BuildRequires: golang = 1.3.3
+BuildRequires: go-md2man
+BuildRequires: device-mapper-devel
+BuildRequires: btrfs-progs-devel
+BuildRequires: sqlite-devel
+BuildRequires: pkgconfig(systemd)
%if 0%{?fedora} = 21
# Resolves: rhbz#1165615
-Requires: device-mapper-libs = 1.02.90-1
+Requires: device-mapper-libs = 1.02.90-1
%endif
# RE: rhbz#1195804 - ensure min NVR for selinux-policy
%if 0%{?fedora} = 23
-Requires: selinux-policy = 3.13.1-114
+Requires: selinux-policy = 3.13.1-114
%endif
# Resolves: rhbz#1045220
-Requires: xz
-Provides: lxc-docker = %{version}-%{release}
+Requires: xz
+Provides: lxc-%{repo} = %{version}-%{release}
+
+Requires: %{repo}-selinux = %{ds_version}-%{release}
# permitted by
[docker-io] include tarballs
commit dbab49eef7d22357d5ad91f9957b715e5acbf550 Author: Lokesh Mandvekar l...@fedoraproject.org Date: Fri Mar 20 10:22:30 2015 -0500 include tarballs Signed-off-by: Lokesh Mandvekar l...@fedoraproject.org sources | 1 + 1 file changed, 1 insertion(+) --- diff --git a/sources b/sources index a70b1c4..c869b0f 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ cd2bfacadfd9a127b5e17c3c65a5fea9 docker-5ebfacd.tar.gz +267f404d7f1c83b26fe028ed76cb3607 docker-selinux-4421e0d.tar.gz ___ golang mailing list golang@lists.fedoraproject.org https://lists.fedoraproject.org/mailman/listinfo/golang
[Bug 1173950] docker-io can't be installed on rhel 6.5 due to requirement device-mapper-libs = 1.02.90-1
https://bugzilla.redhat.com/show_bug.cgi?id=1173950 --- Comment #13 from Nat Guyton nat.guy...@invesco.com --- A yum update did the trick. I'm on 6.6 now, but don't recall whether I was on 6.5 at the time or not. -- You are receiving this mail because: You are on the CC list for the bug. ___ golang mailing list golang@lists.fedoraproject.org https://lists.fedoraproject.org/mailman/listinfo/golang
[Bug 1055712] Review Request: docker - Automates deployment of containerized applications
https://bugzilla.redhat.com/show_bug.cgi?id=1055712 --- Comment #17 from Lokesh Mandvekar l...@redhat.com --- Package Change Request == Package Name: docker Short Description: Automates deployment of containerized applications New Branches: f22 Owners: lsm5 InitialCC: golang-sig (added Short Description: field, I hope this doesn't collide with the prior description) -- You are receiving this mail because: You are on the CC list for the bug. ___ golang mailing list golang@lists.fedoraproject.org https://lists.fedoraproject.org/mailman/listinfo/golang
[Bug 1055712] Review Request: docker - Automates deployment of containerized applications
https://bugzilla.redhat.com/show_bug.cgi?id=1055712 Lokesh Mandvekar l...@redhat.com changed: What|Removed |Added Flags||fedora-cvs? -- You are receiving this mail because: You are on the CC list for the bug. ___ golang mailing list golang@lists.fedoraproject.org https://lists.fedoraproject.org/mailman/listinfo/golang
[Bug 1055712] Review Request: docker - Automates deployment of containerized applications
https://bugzilla.redhat.com/show_bug.cgi?id=1055712 Jon Ciesla limburg...@gmail.com changed: What|Removed |Added Flags|fedora-cvs? |fedora-cvs+ -- You are receiving this mail because: You are on the CC list for the bug. ___ golang mailing list golang@lists.fedoraproject.org https://lists.fedoraproject.org/mailman/listinfo/golang
[Bug 1055712] Review Request: docker - Automates deployment of containerized applications
https://bugzilla.redhat.com/show_bug.cgi?id=1055712 --- Comment #18 from Jon Ciesla limburg...@gmail.com --- Git done (by process-git-requests). Actually that will be ignored, you probably need to have rel-eng fix it. -- You are receiving this mail because: You are on the CC list for the bug. ___ golang mailing list golang@lists.fedoraproject.org https://lists.fedoraproject.org/mailman/listinfo/golang
[etcd/f21] With updated elfutils debug information are now extracted correctly
commit 1f59156965ca8a7898a4c2e19f45b89a054e019f
Author: Jan Chaloupka jchal...@redhat.com
Date: Fri Mar 13 19:34:33 2015 +0100
With updated elfutils debug information are now extracted correctly
etcd.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/etcd.spec b/etcd.spec
index 488191a..5126968 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -1,5 +1,4 @@
# https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12
-%global debug_package %{nil}
%global _dwz_low_mem_die_limit 0
%global providergithub
%global provider_tldcom
@@ -30,6 +29,7 @@ BuildRequires: golang(golang.org/x/net/context)
BuildRequires: golang(github.com/jonboulle/clockwork)
BuildRequires: golang(github.com/stretchr/testify/assert)
BuildRequires: systemd
+BuildRequires: elfutils = 0.161-6
Requires(pre): shadow-utils
Requires(post): systemd
Requires(preun): systemd
___
golang mailing list
golang@lists.fedoraproject.org
https://lists.fedoraproject.org/mailman/listinfo/golang
File kubernetes-a8f2cee.tar.gz uploaded to lookaside cache by jchaloup
A file has been added to the lookaside cache for kubernetes: 3c07648a40731a8a8bcf1190a78d1000 kubernetes-a8f2cee.tar.gz ___ golang mailing list golang@lists.fedoraproject.org https://lists.fedoraproject.org/mailman/listinfo/golang
