[golang] gccgo and macros
by Vincent Batts
commit e0d801060b7ef94d7b2fed314562949dc8dcda8d
Author: Vincent Batts <vbatts(a)hashbangbash.com>
Date: Fri Oct 24 10:34:14 2014 -0400
gccgo and macros
for https://bugzilla.redhat.com/show_bug.cgi?id=1156129 we're putting
the macros in its own rpm.
Also, starting the work on rpm dependencies to accomodate gccgo
golang.spec | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/golang.spec b/golang.spec
index c7a80dc..daf8a4d 100644
--- a/golang.spec
+++ b/golang.spec
@@ -37,6 +37,8 @@
%global gohostarch arm
%endif
+%global go_api 1.3.3
+
Name: golang
Version: 1.3.3
Release: 1%{?dist}
@@ -60,7 +62,8 @@ BuildRequires: /bin/hostname
Provides: go = %{version}-%{release}
Requires: golang-bin
-Requires: golang-src
+Requires: golang-src = %{version}-%{release}
+Requires: golang-srpm-macros = %{version}-%{release}
BuildRequires: emacs
@@ -108,6 +111,14 @@ Source102: macros.golang
#%{summary}.
+%package srpm-macros
+Summary: RPM macros for the Go programming language
+BuildArch: noarch
+
+%description srpm-macros
+%{summary}.
+
+
%package vim
Summary: Vim plugins for Go
# fedora only
@@ -133,7 +144,6 @@ BuildArch: noarch
# the source tree
%package src
Summary: Golang compiler source tree
-Requires: go = %{version}-%{release}
BuildArch: noarch
%description src
%{summary}
@@ -147,6 +157,7 @@ Requires: go = %{version}-%{release}
Requires: golang-pkg-linux-386 = %{version}-%{release}
Requires(post): golang-pkg-linux-386 = %{version}-%{release}
Provides: golang-bin = 386
+Provides: go(API)(go) = %{go_api}
# We strip the meta dependency, but go does require glibc.
# This is an odd issue, still looking for a better fix.
Requires: glibc
@@ -164,6 +175,7 @@ Requires: go = %{version}-%{release}
Requires: golang-pkg-linux-amd64 = %{version}-%{release}
Requires(post): golang-pkg-linux-amd64 = %{version}-%{release}
Provides: golang-bin = amd64
+Provides: go(API)(go) = %{go_api}
# We strip the meta dependency, but go does require glibc.
# This is an odd issue, still looking for a better fix.
Requires: glibc
@@ -181,6 +193,7 @@ Requires: go = %{version}-%{release}
Requires: golang-pkg-linux-arm = %{version}-%{release}
Requires(post): golang-pkg-linux-arm = %{version}-%{release}
Provides: golang-bin = arm
+Provides: go(API)(go) = %{go_api}
# We strip the meta dependency, but go does require glibc.
# This is an odd issue, still looking for a better fix.
Requires: glibc
@@ -198,6 +211,7 @@ Requires(postun): %{_sbindir}/update-alternatives
%package pkg-linux-386
Summary: Golang compiler toolchain to compile for linux 386
Requires: go = %{version}-%{release}
+Provides: go(API)(cgo) = %{go_api}
BuildArch: noarch
%description pkg-linux-386
%{summary}
@@ -205,6 +219,7 @@ BuildArch: noarch
%package pkg-linux-amd64
Summary: Golang compiler toolchain to compile for linux amd64
Requires: go = %{version}-%{release}
+Provides: go(API)(cgo) = %{go_api}
BuildArch: noarch
%description pkg-linux-amd64
%{summary}
@@ -212,6 +227,7 @@ BuildArch: noarch
%package pkg-linux-arm
Summary: Golang compiler toolchain to compile for linux arm
Requires: go = %{version}-%{release}
+Provides: go(API)(cgo) = %{go_api}
BuildArch: noarch
%description pkg-linux-arm
%{summary}
@@ -624,6 +640,8 @@ fi
# prelink blacklist
%{_sysconfdir}/prelink.conf.d
+
+%files srpm-macros
%if 0%{?rhel} > 6 || 0%{?fedora} > 0
%{_rpmconfigdir}/macros.d/macros.golang
%else
9 years, 7 months
[golang-github-SeanDolphin-bqschema] Bump to upstream 41d07ee00eeaf8282a8bde17cbddab98635b7a4a - related: #1148460
by Jan Chaloupka
commit 0fc406048a0ad1d1f8b90fa5d35d60df820dbaee
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Fri Oct 24 13:34:26 2014 +0200
Bump to upstream 41d07ee00eeaf8282a8bde17cbddab98635b7a4a
- related: #1148460
.gitignore | 2 +-
golang-github-SeanDolphin-bqschema.spec | 14 +++++++++++---
sources | 2 +-
3 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 226f632..948879c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/bqschema-a713d26.tar.gz
+/bqschema-41d07ee.tar.gz
diff --git a/golang-github-SeanDolphin-bqschema.spec b/golang-github-SeanDolphin-bqschema.spec
index 2554e0b..9bbb27a 100644
--- a/golang-github-SeanDolphin-bqschema.spec
+++ b/golang-github-SeanDolphin-bqschema.spec
@@ -2,7 +2,7 @@
%global provider_tld com
%global project SeanDolphin
%global repo bqschema
-%global commit a713d26df274e999ec10e9bbc7e73a1c4791053c
+%global commit 41d07ee00eeaf8282a8bde17cbddab98635b7a4a
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
%global shortcommit %(c=%{commit}; echo ${c:0:7})
@@ -10,12 +10,16 @@
Name: golang-%{provider}-%{project}-%{repo}
Version: 0
-Release: 0.1.git%{shortcommit}%{?dist}
+Release: 0.3.git%{shortcommit}%{?dist}
Summary: Package for creating Google Big Query from Go structs
License: ASL 2.0
URL: http://%{import_path}
Source0: https://github.com/%{project}/%{repo}/archive/%{commit}/%{repo}-%{shortco...
-BuildArch: noarch
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
+BuildArch: noarch
+%else
+ExclusiveArch: %{ix86} x86_64 %{arm}
+%endif
%description
BQSchema is a package used to created Google Big Query schema
@@ -59,6 +63,10 @@ GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}
%{gopath}/src/%{import_path}/*.yaml
%changelog
+* Fri Oct 24 2014 jchaloup <jchaloup(a)redhat.com> - 0-0.3.git41d07ee
+- Bump to upstream 41d07ee00eeaf8282a8bde17cbddab98635b7a4a
+ related: #1148460
+
* Thu Sep 25 2014 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.1.gitb8a3500
- First package for Fedora
diff --git a/sources b/sources
index 19ebba4..0eab263 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7be2c54fccbbcc9d8040eb08658ba503 bqschema-a713d26.tar.gz
+8063ba3f85693a3455f8df06279dcf5a bqschema-41d07ee.tar.gz
9 years, 7 months
[golang-github-SeanDolphin-bqschema/f21] Bump to upstream 41d07ee00eeaf8282a8bde17cbddab98635b7a4a - related: #1148460
by Jan Chaloupka
commit 4ad961870400241f1f480975ab9f3a8783a791fd
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Fri Oct 24 13:34:26 2014 +0200
Bump to upstream 41d07ee00eeaf8282a8bde17cbddab98635b7a4a
- related: #1148460
.gitignore | 2 +-
golang-github-SeanDolphin-bqschema.spec | 14 +++++++++++---
sources | 2 +-
3 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 226f632..948879c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/bqschema-a713d26.tar.gz
+/bqschema-41d07ee.tar.gz
diff --git a/golang-github-SeanDolphin-bqschema.spec b/golang-github-SeanDolphin-bqschema.spec
index 2554e0b..9bbb27a 100644
--- a/golang-github-SeanDolphin-bqschema.spec
+++ b/golang-github-SeanDolphin-bqschema.spec
@@ -2,7 +2,7 @@
%global provider_tld com
%global project SeanDolphin
%global repo bqschema
-%global commit a713d26df274e999ec10e9bbc7e73a1c4791053c
+%global commit 41d07ee00eeaf8282a8bde17cbddab98635b7a4a
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
%global shortcommit %(c=%{commit}; echo ${c:0:7})
@@ -10,12 +10,16 @@
Name: golang-%{provider}-%{project}-%{repo}
Version: 0
-Release: 0.1.git%{shortcommit}%{?dist}
+Release: 0.3.git%{shortcommit}%{?dist}
Summary: Package for creating Google Big Query from Go structs
License: ASL 2.0
URL: http://%{import_path}
Source0: https://github.com/%{project}/%{repo}/archive/%{commit}/%{repo}-%{shortco...
-BuildArch: noarch
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
+BuildArch: noarch
+%else
+ExclusiveArch: %{ix86} x86_64 %{arm}
+%endif
%description
BQSchema is a package used to created Google Big Query schema
@@ -59,6 +63,10 @@ GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}
%{gopath}/src/%{import_path}/*.yaml
%changelog
+* Fri Oct 24 2014 jchaloup <jchaloup(a)redhat.com> - 0-0.3.git41d07ee
+- Bump to upstream 41d07ee00eeaf8282a8bde17cbddab98635b7a4a
+ related: #1148460
+
* Thu Sep 25 2014 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.1.gitb8a3500
- First package for Fedora
diff --git a/sources b/sources
index 19ebba4..0eab263 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7be2c54fccbbcc9d8040eb08658ba503 bqschema-a713d26.tar.gz
+8063ba3f85693a3455f8df06279dcf5a bqschema-41d07ee.tar.gz
9 years, 7 months
[golang-github-SeanDolphin-bqschema/f20] Bump to upstream 41d07ee00eeaf8282a8bde17cbddab98635b7a4a - related: #1148460
by Jan Chaloupka
commit fe9bc921a7a6db7e5591be880c8d8fcd6d891f30
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Fri Oct 24 13:34:26 2014 +0200
Bump to upstream 41d07ee00eeaf8282a8bde17cbddab98635b7a4a
- related: #1148460
.gitignore | 2 +-
golang-github-SeanDolphin-bqschema.spec | 14 +++++++++++---
sources | 2 +-
3 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 226f632..948879c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/bqschema-a713d26.tar.gz
+/bqschema-41d07ee.tar.gz
diff --git a/golang-github-SeanDolphin-bqschema.spec b/golang-github-SeanDolphin-bqschema.spec
index 2554e0b..9bbb27a 100644
--- a/golang-github-SeanDolphin-bqschema.spec
+++ b/golang-github-SeanDolphin-bqschema.spec
@@ -2,7 +2,7 @@
%global provider_tld com
%global project SeanDolphin
%global repo bqschema
-%global commit a713d26df274e999ec10e9bbc7e73a1c4791053c
+%global commit 41d07ee00eeaf8282a8bde17cbddab98635b7a4a
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
%global shortcommit %(c=%{commit}; echo ${c:0:7})
@@ -10,12 +10,16 @@
Name: golang-%{provider}-%{project}-%{repo}
Version: 0
-Release: 0.1.git%{shortcommit}%{?dist}
+Release: 0.3.git%{shortcommit}%{?dist}
Summary: Package for creating Google Big Query from Go structs
License: ASL 2.0
URL: http://%{import_path}
Source0: https://github.com/%{project}/%{repo}/archive/%{commit}/%{repo}-%{shortco...
-BuildArch: noarch
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
+BuildArch: noarch
+%else
+ExclusiveArch: %{ix86} x86_64 %{arm}
+%endif
%description
BQSchema is a package used to created Google Big Query schema
@@ -59,6 +63,10 @@ GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}
%{gopath}/src/%{import_path}/*.yaml
%changelog
+* Fri Oct 24 2014 jchaloup <jchaloup(a)redhat.com> - 0-0.3.git41d07ee
+- Bump to upstream 41d07ee00eeaf8282a8bde17cbddab98635b7a4a
+ related: #1148460
+
* Thu Sep 25 2014 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.1.gitb8a3500
- First package for Fedora
diff --git a/sources b/sources
index 19ebba4..0eab263 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7be2c54fccbbcc9d8040eb08658ba503 bqschema-a713d26.tar.gz
+8063ba3f85693a3455f8df06279dcf5a bqschema-41d07ee.tar.gz
9 years, 7 months
[kubernetes/f20] Bump to upstream e46af6e37f6e6965a63edb8eb8f115ae8ef41482
by Eric Paris
commit f56dc6605dfa4df0b4cbb6631a251d71a3d5795c
Author: Eric Paris <eparis(a)redhat.com>
Date: Fri Oct 24 08:26:23 2014 -0400
Bump to upstream e46af6e37f6e6965a63edb8eb8f115ae8ef41482
.gitignore | 6 +
apiserver | 26 -----
config | 23 ----
controller-manager | 7 --
kube-apiserver.service | 23 ----
kube-controller-manager.service | 18 ---
kube-proxy.service | 16 ---
kube-scheduler.service | 17 ---
kubecfg.bash | 217 ---------------------------------------
kubelet | 14 ---
kubelet.service | 22 ----
kubernetes.spec | 49 +++++----
proxy | 7 --
scheduler | 7 --
sources | 2 +-
15 files changed, 34 insertions(+), 420 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 76e5687..2ed7d62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,9 @@
+/clog
/kubernetes-98ac8e1.tar.gz
/kubernetes-4452163.tar.gz
/kubernetes-b011263.tar.gz
+/kubernetes-d5377e4.tar.gz
+/kubernetes-e868642.tar.gz
+/kubernetes-97dd730.tar.gz
+/kubernetes-77d2815.tar.gz
+/kubernetes-e46af6e.tar.gz
diff --git a/kubernetes.spec b/kubernetes.spec
index 4de307e..1dd07b7 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 b01126322b826a15db06f6eeefeeb56dc06db7af
+%global commit e46af6e37f6e6965a63edb8eb8f115ae8ef41482
%global shortcommit %(c=%{commit}; echo ${c:0:7})
#binaries which should be called kube-*
@@ -18,27 +18,13 @@
Name: kubernetes
Version: 0.4
-Release: 0.1.git%{shortcommit}%{?dist}
+Release: 0.6.git%{shortcommit}%{?dist}
Summary: Container cluster management
License: ASL 2.0
URL: https://github.com/GoogleCloudPlatform/kubernetes
ExclusiveArch: x86_64
Source0: https://github.com/GoogleCloudPlatform/kubernetes/archive/%{commit}/kuber...
-#config files
-Source10: config
-Source11: apiserver
-Source12: controller-manager
-Source13: proxy
-Source14: kubelet
-Source15: scheduler
-#service files
-Source20: kube-apiserver.service
-Source21: kube-controller-manager.service
-Source22: kube-proxy.service
-Source23: kubelet.service
-Source24: kube-scheduler.service
-
Patch1: 0001-remove-all-third-party-software.patch
%if 0%{?fedora} >= 21 || 0%{?rhel}
@@ -152,15 +138,15 @@ done
# install the bash completion
install -d -m 0755 %{buildroot}%{_datadir}/bash-completion/completions/
-install -t %{buildroot}%{_datadir}/bash-completion/completions/ contrib/completions/bash/kubecfg
+install -t %{buildroot}%{_datadir}/bash-completion/completions/ contrib/completions/bash/kubectl
# install config files
install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}
-install -m 644 -t %{buildroot}%{_sysconfdir}/%{name} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15}
+install -m 644 -t %{buildroot}%{_sysconfdir}/%{name} contrib/init/systemd/environ/*
# install service files
install -d -m 0755 %{buildroot}%{_unitdir}
-install -m 0644 -t %{buildroot}%{_unitdir} %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24}
+install -m 0644 -t %{buildroot}%{_unitdir} contrib/init/systemd/*.service
# install manpages
install -d %{buildroot}%{_mandir}/man1
@@ -184,7 +170,7 @@ install -d %{buildroot}/var/lib/kubelet
%{_unitdir}/kube-controller-manager.service
%{_unitdir}/kube-proxy.service
%dir %{_sysconfdir}/%{name}
-%{_datadir}/bash-completion/completions/kubecfg
+%{_datadir}/bash-completion/completions/kubectl
%dir /var/lib/kubelet
%config(noreplace) %{_sysconfdir}/%{name}/config
%config(noreplace) %{_sysconfdir}/%{name}/apiserver
@@ -198,15 +184,34 @@ getent group kube >/dev/null || groupadd -r kube
getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
-c "Kubernetes user" kube
%post
-%systemd_post %{basename:%{SOURCE20}} %{basename:%{SOURCE21}} %{basename:%{SOURCE22}} %{basename:%{SOURCE22}} %{basename:%{SOURCE24}}
+%systemd_post kube-apiserver kube-scheduler kube-controller-manager kubelet kube-proxy
%preun
-%systemd_preun %{basename:%{SOURCE20}} %{basename:%{SOURCE21}} %{basename:%{SOURCE22}} %{basename:%{SOURCE23}} %{basename:%{SOURCE24}}
+%systemd_preun kube-apiserver kube-scheduler kube-controller-manager kubelet kube-proxy
%postun
%systemd_postun
%changelog
+* Fri Oct 24 2014 Eric Paris <eparis(a)redhat.com - 0.4-0.6.gite46af6e
+- Bump to upstream e46af6e37f6e6965a63edb8eb8f115ae8ef41482
+
+* Thu Oct 23 2014 Eric Paris <eparis(a)redhat.com - 0.4-0.5.git77d2815
+- Bump to upstream 77d2815b86e9581393d7de4379759c536df89edc
+
+* Wed Oct 22 2014 Eric Paris <eparis(a)redhat.com - 0.4-0.4.git97dd730
+- Bump to upstream 97dd7302ac2c2b9458a9348462a614ebf394b1ed
+- Use upstream kubectl bash completion instead of in-repo
+- Fix systemd_post and systemd_preun since we are using upstream service files
+
+* Tue Oct 21 2014 Eric Paris <eparis(a)redhat.com - 0.4-0.3.gite868642
+- Bump to upstream e8686429c4aa63fc73401259c8818da168a7b85e
+
+* Mon Oct 20 2014 Eric Paris <eparis(a)redhat.com - 0.4-0.2.gitd5377e4
+- Bump to upstream d5377e4a394b4fc6e3088634729b538eac124b1b
+- Use in tree systemd unit and Environment files
+- Include kubectl bash completion from outside tree
+
* Fri Oct 17 2014 Eric Paris <eparis(a)redhat.com - 0.4-0.1.gitb011263
- Bump to upstream b01126322b826a15db06f6eeefeeb56dc06db7af
- This is a major non backward compatible change.
diff --git a/sources b/sources
index 996d449..4b7c976 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6dfac48ac66d5752dacdc8c24c37702d kubernetes-b011263.tar.gz
+e8c37ca3d308f303ac55771aa5925ce5 kubernetes-e46af6e.tar.gz
9 years, 7 months
[kubernetes/f21] Bump to upstream e46af6e37f6e6965a63edb8eb8f115ae8ef41482
by Eric Paris
commit f435c959c508e7f4936a44838cea376b4b845d78
Author: Eric Paris <eparis(a)redhat.com>
Date: Fri Oct 24 08:23:43 2014 -0400
Bump to upstream e46af6e37f6e6965a63edb8eb8f115ae8ef41482
.gitignore | 6 +
apiserver | 26 -----
config | 23 ----
controller-manager | 7 --
kube-apiserver.service | 23 ----
kube-controller-manager.service | 18 ---
kube-proxy.service | 16 ---
kube-scheduler.service | 17 ---
kubecfg.bash | 217 ---------------------------------------
kubelet | 14 ---
kubelet.service | 22 ----
kubernetes.spec | 49 +++++----
proxy | 7 --
scheduler | 7 --
sources | 2 +-
15 files changed, 34 insertions(+), 420 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 76e5687..2ed7d62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,9 @@
+/clog
/kubernetes-98ac8e1.tar.gz
/kubernetes-4452163.tar.gz
/kubernetes-b011263.tar.gz
+/kubernetes-d5377e4.tar.gz
+/kubernetes-e868642.tar.gz
+/kubernetes-97dd730.tar.gz
+/kubernetes-77d2815.tar.gz
+/kubernetes-e46af6e.tar.gz
diff --git a/kubernetes.spec b/kubernetes.spec
index 4de307e..1dd07b7 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 b01126322b826a15db06f6eeefeeb56dc06db7af
+%global commit e46af6e37f6e6965a63edb8eb8f115ae8ef41482
%global shortcommit %(c=%{commit}; echo ${c:0:7})
#binaries which should be called kube-*
@@ -18,27 +18,13 @@
Name: kubernetes
Version: 0.4
-Release: 0.1.git%{shortcommit}%{?dist}
+Release: 0.6.git%{shortcommit}%{?dist}
Summary: Container cluster management
License: ASL 2.0
URL: https://github.com/GoogleCloudPlatform/kubernetes
ExclusiveArch: x86_64
Source0: https://github.com/GoogleCloudPlatform/kubernetes/archive/%{commit}/kuber...
-#config files
-Source10: config
-Source11: apiserver
-Source12: controller-manager
-Source13: proxy
-Source14: kubelet
-Source15: scheduler
-#service files
-Source20: kube-apiserver.service
-Source21: kube-controller-manager.service
-Source22: kube-proxy.service
-Source23: kubelet.service
-Source24: kube-scheduler.service
-
Patch1: 0001-remove-all-third-party-software.patch
%if 0%{?fedora} >= 21 || 0%{?rhel}
@@ -152,15 +138,15 @@ done
# install the bash completion
install -d -m 0755 %{buildroot}%{_datadir}/bash-completion/completions/
-install -t %{buildroot}%{_datadir}/bash-completion/completions/ contrib/completions/bash/kubecfg
+install -t %{buildroot}%{_datadir}/bash-completion/completions/ contrib/completions/bash/kubectl
# install config files
install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}
-install -m 644 -t %{buildroot}%{_sysconfdir}/%{name} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15}
+install -m 644 -t %{buildroot}%{_sysconfdir}/%{name} contrib/init/systemd/environ/*
# install service files
install -d -m 0755 %{buildroot}%{_unitdir}
-install -m 0644 -t %{buildroot}%{_unitdir} %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24}
+install -m 0644 -t %{buildroot}%{_unitdir} contrib/init/systemd/*.service
# install manpages
install -d %{buildroot}%{_mandir}/man1
@@ -184,7 +170,7 @@ install -d %{buildroot}/var/lib/kubelet
%{_unitdir}/kube-controller-manager.service
%{_unitdir}/kube-proxy.service
%dir %{_sysconfdir}/%{name}
-%{_datadir}/bash-completion/completions/kubecfg
+%{_datadir}/bash-completion/completions/kubectl
%dir /var/lib/kubelet
%config(noreplace) %{_sysconfdir}/%{name}/config
%config(noreplace) %{_sysconfdir}/%{name}/apiserver
@@ -198,15 +184,34 @@ getent group kube >/dev/null || groupadd -r kube
getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
-c "Kubernetes user" kube
%post
-%systemd_post %{basename:%{SOURCE20}} %{basename:%{SOURCE21}} %{basename:%{SOURCE22}} %{basename:%{SOURCE22}} %{basename:%{SOURCE24}}
+%systemd_post kube-apiserver kube-scheduler kube-controller-manager kubelet kube-proxy
%preun
-%systemd_preun %{basename:%{SOURCE20}} %{basename:%{SOURCE21}} %{basename:%{SOURCE22}} %{basename:%{SOURCE23}} %{basename:%{SOURCE24}}
+%systemd_preun kube-apiserver kube-scheduler kube-controller-manager kubelet kube-proxy
%postun
%systemd_postun
%changelog
+* Fri Oct 24 2014 Eric Paris <eparis(a)redhat.com - 0.4-0.6.gite46af6e
+- Bump to upstream e46af6e37f6e6965a63edb8eb8f115ae8ef41482
+
+* Thu Oct 23 2014 Eric Paris <eparis(a)redhat.com - 0.4-0.5.git77d2815
+- Bump to upstream 77d2815b86e9581393d7de4379759c536df89edc
+
+* Wed Oct 22 2014 Eric Paris <eparis(a)redhat.com - 0.4-0.4.git97dd730
+- Bump to upstream 97dd7302ac2c2b9458a9348462a614ebf394b1ed
+- Use upstream kubectl bash completion instead of in-repo
+- Fix systemd_post and systemd_preun since we are using upstream service files
+
+* Tue Oct 21 2014 Eric Paris <eparis(a)redhat.com - 0.4-0.3.gite868642
+- Bump to upstream e8686429c4aa63fc73401259c8818da168a7b85e
+
+* Mon Oct 20 2014 Eric Paris <eparis(a)redhat.com - 0.4-0.2.gitd5377e4
+- Bump to upstream d5377e4a394b4fc6e3088634729b538eac124b1b
+- Use in tree systemd unit and Environment files
+- Include kubectl bash completion from outside tree
+
* Fri Oct 17 2014 Eric Paris <eparis(a)redhat.com - 0.4-0.1.gitb011263
- Bump to upstream b01126322b826a15db06f6eeefeeb56dc06db7af
- This is a major non backward compatible change.
diff --git a/sources b/sources
index 996d449..4b7c976 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6dfac48ac66d5752dacdc8c24c37702d kubernetes-b011263.tar.gz
+e8c37ca3d308f303ac55771aa5925ce5 kubernetes-e46af6e.tar.gz
9 years, 7 months
[kubernetes] Bump to upstream e46af6e37f6e6965a63edb8eb8f115ae8ef41482
by Eric Paris
commit f86849ef519b3d39b0581f53a4840f464a13158c
Author: Eric Paris <eparis(a)redhat.com>
Date: Fri Oct 24 08:07:07 2014 -0400
Bump to upstream e46af6e37f6e6965a63edb8eb8f115ae8ef41482
.gitignore | 1 +
kubernetes.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0241cd4..2ed7d62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/kubernetes-e868642.tar.gz
/kubernetes-97dd730.tar.gz
/kubernetes-77d2815.tar.gz
+/kubernetes-e46af6e.tar.gz
diff --git a/kubernetes.spec b/kubernetes.spec
index 6b284aa..1dd07b7 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 77d2815b86e9581393d7de4379759c536df89edc
+%global commit e46af6e37f6e6965a63edb8eb8f115ae8ef41482
%global shortcommit %(c=%{commit}; echo ${c:0:7})
#binaries which should be called kube-*
@@ -18,7 +18,7 @@
Name: kubernetes
Version: 0.4
-Release: 0.5.git%{shortcommit}%{?dist}
+Release: 0.6.git%{shortcommit}%{?dist}
Summary: Container cluster management
License: ASL 2.0
URL: https://github.com/GoogleCloudPlatform/kubernetes
@@ -193,6 +193,9 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
%systemd_postun
%changelog
+* Fri Oct 24 2014 Eric Paris <eparis(a)redhat.com - 0.4-0.6.gite46af6e
+- Bump to upstream e46af6e37f6e6965a63edb8eb8f115ae8ef41482
+
* Thu Oct 23 2014 Eric Paris <eparis(a)redhat.com - 0.4-0.5.git77d2815
- Bump to upstream 77d2815b86e9581393d7de4379759c536df89edc
diff --git a/sources b/sources
index e09afa3..4b7c976 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9056c563ef53e66e38786dd7e7d84692 kubernetes-77d2815.tar.gz
+e8c37ca3d308f303ac55771aa5925ce5 kubernetes-e46af6e.tar.gz
9 years, 7 months
[golang-github-stretchr-testify] Bump to upstream d6577e08ec30538639ac0ea38b562b6f250e9055 Spec file polishing to follow go draft - r
by Jan Chaloupka
commit f37d61ecfb07ef7af93870bd977a207ec909c758
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Thu Oct 23 15:51:53 2014 +0200
Bump to upstream d6577e08ec30538639ac0ea38b562b6f250e9055
Spec file polishing to follow go draft
- related: #1141872
.gitignore | 2 +-
golang-github-stretchr-testify.spec | 25 +++++++++++++++++++------
sources | 2 +-
3 files changed, 21 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7de03ff..b1eb68e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/testify-da775f0.tar.gz
+/testify-d6577e0.tar.gz
diff --git a/golang-github-stretchr-testify.spec b/golang-github-stretchr-testify.spec
index 4dd1c4e..7019b05 100644
--- a/golang-github-stretchr-testify.spec
+++ b/golang-github-stretchr-testify.spec
@@ -1,16 +1,24 @@
%global debug_package %{nil}
-%global import_path github.com/stretchr/testify
-%global commit da775f0337260efbac0fce9764cee5bd3e8c85b8
+%global provider github
+%global provider_tld com
+%global project stretchr
+%global repo testify
+%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
+%global commit d6577e08ec30538639ac0ea38b562b6f250e9055
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-Name: golang-github-stretchr-testify
+Name: golang-%{provider}-%{project}-%{repo}
Version: 0
-Release: 0.3.git%{shortcommit}%{?dist}
+Release: 0.5.git%{shortcommit}%{?dist}
Summary: Tools for testifying that your code will behave as you intend
License: MIT
URL: http://godoc.org/%{import_path}
-Source0: https://%{import_path}/archive/%{commit}/testify-%{shortcommit}.tar.gz
+Source0: https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
BuildArch: noarch
+%else
+ExclusiveArch: %{ix86} x86_64 %{arm}
+%endif
%description
Thou Shalt Write Tests
@@ -37,7 +45,7 @@ Go code (golang) set of packages that provide many tools for testifying that
your code will behave as you intend.
%prep
-%setup -q -n testify-%{commit}
+%setup -q -n %{repo}-%{commit}
mv LICENCE.txt LICENSE.txt
@@ -73,6 +81,11 @@ done
%{gopath}/src/%{import_path}/suite/*.go
%changelog
+* Thu Oct 23 2014 jchaloup <jchaloup(a)redhat.com> - 0-0.5.gitd6577e0
+- Bump to upstream d6577e08ec30538639ac0ea38b562b6f250e9055
+- Spec file polishing to follow go draft
+ related: #1141872
+
* Mon Sep 15 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 0-0.3.gitda775f0
- preserve timestamps of copied files
diff --git a/sources b/sources
index 564eb53..d4f3bce 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-caf0ae83603dc52e382e143df98e7bfc testify-da775f0.tar.gz
+6f165949676732088dccde13bbd95d7e testify-d6577e0.tar.gz
9 years, 7 months