[etcd/f21] Update configuration and service file - related: #1191441
commit 4b25db45986383caee84692dbd911e3a4606a214
Author: Jan Chaloupka jchal...@redhat.com
Date: Wed Feb 18 15:40:23 2015 +0100
Update configuration and service file
- related: #1191441
...ricated-ErrWrongType-with-its-local-defin.patch | 693 +
etcd.conf | 68 +-
etcd.service | 2 +-
etcd.spec | 13 +-
4 files changed, 740 insertions(+), 36 deletions(-)
---
diff --git
a/etcd-2.0.1-Replace-depricated-ErrWrongType-with-its-local-defin.patch
b/etcd-2.0.1-Replace-depricated-ErrWrongType-with-its-local-defin.patch
new file mode 100644
index 000..275e6ae
--- /dev/null
+++ b/etcd-2.0.1-Replace-depricated-ErrWrongType-with-its-local-defin.patch
@@ -0,0 +1,693 @@
+From 62d30d1b956bbc7f4249e3b42c6f8b3e5db26789 Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka jchal...@redhat.com
+Date: Fri, 20 Feb 2015 11:04:20 +0100
+Subject: [PATCH] Replace depricated ErrWrongType with its local definition
+
+---
+ etcdserver/etcdserverpb/etcdserver.pb.go | 39 ++-
+ migrate/etcd4pb/log_entry.pb.go | 10 +++--
+ raft/raftpb/raft.pb.go | 64 ++--
+ snap/snappb/snap.pb.go | 6 ++-
+ wal/walpb/record.pb.go | 13 ---
+ 5 files changed, 75 insertions(+), 57 deletions(-)
+
+diff --git a/etcdserver/etcdserverpb/etcdserver.pb.go
b/etcdserver/etcdserverpb/etcdserver.pb.go
+index 2e8afc0..42eb0c2 100644
+--- a/etcdserver/etcdserverpb/etcdserver.pb.go
b/etcdserver/etcdserverpb/etcdserver.pb.go
+@@ -22,6 +22,7 @@ import math math
+
+ import io io
+ import code_google_com_p_gogoprotobuf_proto
code.google.com/p/gogoprotobuf/proto
++import errors errors
+
+ // Reference proto, json, and math imports to suppress error if they are not
otherwise used.
+ var _ = proto.Marshal
+@@ -67,6 +68,7 @@ func init() {
+ func (m *Request) Unmarshal(data []byte) error {
+ l := len(data)
+ index := 0
++ var ErrWrongType = errors.New(proto: field/encoding mismatch: wrong
type for field)
+ for index l {
+ var wire uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -85,7 +87,7 @@ func (m *Request) Unmarshal(data []byte) error {
+ switch fieldNum {
+ case 1:
+ if wireType != 0 {
+- return
code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index = l {
+@@ -100,7 +102,7 @@ func (m *Request) Unmarshal(data []byte) error {
+ }
+ case 2:
+ if wireType != 2 {
+- return
code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -122,7 +124,7 @@ func (m *Request) Unmarshal(data []byte) error {
+ index = postIndex
+ case 3:
+ if wireType != 2 {
+- return
code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -144,7 +146,7 @@ func (m *Request) Unmarshal(data []byte) error {
+ index = postIndex
+ case 4:
+ if wireType != 2 {
+- return
code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -166,7 +168,7 @@ func (m *Request) Unmarshal(data []byte) error {
+ index = postIndex
+ case 5:
+ if wireType != 0 {
+- return
code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var v int
+ for shift := uint(0); ; shift += 7 {
+@@ -183,7 +185,7 @@ func (m *Request) Unmarshal(data []byte) error {
+ m.Dir = bool(v != 0)
+ case 6:
+ if wireType != 2 {
+- return
code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -205,7 +207,7 @@ func (m *Request)
[etcd/f21] Add missing debug info to binaries (patch from Jan Kratochvil) - resolves: #1184257
commit 944f0a75ec576f0c2114890c56deaf878b51ae2c
Author: Jan Chaloupka jchal...@redhat.com
Date: Mon Feb 9 10:12:35 2015 +0100
Add missing debug info to binaries (patch from Jan Kratochvil)
- resolves: #1184257
etcd.spec | 23 +++
1 file changed, 15 insertions(+), 8 deletions(-)
---
diff --git a/etcd.spec b/etcd.spec
index 608f1ee..fbea03e 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -1,4 +1,5 @@
-%global debug_package %{nil}
+# https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12
+%global _dwz_low_mem_die_limit 0
%global providergithub
%global provider_tldcom
%global project coreos
@@ -8,7 +9,7 @@
Name: %{repo}
Version: 2.0.0
-Release: 0.4%{?dist}
+Release: 0.5%{?dist}
Summary: A highly-available key value store for shared configuration
License: ASL 2.0
URL: https://%{import_path}
@@ -18,7 +19,7 @@ Source2: %{name}.conf
ExclusiveArch: %{ix86} x86_64 %{arm}
BuildRequires: golang = 1.3.3
-BuildRequires: golang(code.google.com/p/gogoprotobuf)
+BuildRequires: golang(code.google.com/p/gogoprotobuf/proto)
BuildRequires: golang(github.com/codegangsta/cli)
BuildRequires: golang(github.com/coreos/go-etcd/etcd)
BuildRequires: golang(golang.org/x/net/context)
@@ -35,7 +36,7 @@ A highly-available key value store for shared configuration.
%package devel
BuildRequires: golang = 1.2.1-3
-BuildRequires: golang(code.google.com/p/gogoprotobuf)
+BuildRequires: golang(code.google.com/p/gogoprotobuf/proto)
BuildRequires: golang(github.com/codegangsta/cli)
BuildRequires: golang(github.com/coreos/go-etcd/etcd)
BuildRequires: golang(golang.org/x/net/context)
@@ -96,9 +97,11 @@ mkdir -p src/github.com/coreos
ln -s ../../../ src/github.com/coreos/etcd
export GOPATH=$(pwd):%{gopath}:$GOPATH
-go build -v -x -o bin/etcd %{import_path}
-go build -a -ldflags '-s' -o bin/etcdctl %{import_path}/etcdctl
-go build -v -x -o bin/etcd-migrate %{import_path}/tools/%{name}-migrate
+# *** ERROR: No build ID note found in
/.../BUILDROOT/etcd-2.0.0-1.rc1.fc22.x86_64/usr/bin/etcd
+function gobuild { go build -a -ldflags -B 0x$(head -c20 /dev/urandom|od -An
-tx1|tr -d ' \n') -v -x $@; }
+gobuild -o bin/etcd %{import_path}
+gobuild -o bin/etcdctl %{import_path}/etcdctl
+gobuild -o bin/etcd-migrate %{import_path}/tools/%{name}-migrate
%install
@@ -175,6 +178,10 @@ getent passwd %{name} /dev/null || useradd -r -g %{name}
-d %{_sharedstatedir}/
%{gopath}/src/%{import_path}
%changelog
+* Mon Feb 09 2015 jchaloup jchal...@redhat.com - 2.0.0-0.5
+- Add missing debug info to binaries (patch from Jan Kratochvil)
+ resolves: #1184257
+
* Fri Jan 30 2015 jchaloup jchal...@redhat.com - 2.0.0-0.4
- Update to etcd-2.0.0
- use gopath as the last directory to search for source code
@@ -193,7 +200,7 @@ getent passwd %{name} /dev/null || useradd -r -g %{name}
-d %{_sharedstatedir}/
* Fri Oct 17 2014 jchaloup jchal...@redhat.com - 0.4.6-8
- Add ExclusiveArch for go_arches
-* Wed Jan 21 2015 Eric Paris epa...@redhat.com - 0.4.6-7
+* Wed Oct 15 2014 Eric Paris epa...@redhat.com - 0.4.6-7
- default to /var/lib/etcd/default.etcd as 2.0 uses that default
* Mon Oct 06 2014 jchaloup jchal...@redhat.com - 0.4.6-6
___
golang mailing list
golang@lists.fedoraproject.org
https://lists.fedoraproject.org/mailman/listinfo/golang
[etcd/f21] Update to etcd-2.0.0 - related: #1176138
commit 05b7ad4d6720f71533d7bccfad8cec8fd2bdf4bc
Author: Jan Chaloupka jchal...@redhat.com
Date: Fri Jan 30 15:42:04 2015 +0100
Update to etcd-2.0.0
- related: #1176138
.gitignore | 4 +---
etcd.spec | 21 +
sources| 2 +-
3 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2d72061..06bc6b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-/clog
-/etcd-0.4.6.tar.gz
-/v2.0.0-rc.1.tar.gz
+/v2.0.0.tar.gz
diff --git a/etcd.spec b/etcd.spec
index 8661e10..608f1ee 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -8,11 +8,11 @@
Name: %{repo}
Version: 2.0.0
-Release: 0.2.rc1%{?dist}
+Release: 0.4%{?dist}
Summary: A highly-available key value store for shared configuration
License: ASL 2.0
URL: https://%{import_path}
-Source0: https://%{import_path}/archive/v%{version}-rc.1.tar.gz
+Source0: https://%{import_path}/archive/v%{version}.tar.gz
Source1: %{name}.service
Source2: %{name}.conf
ExclusiveArch: %{ix86} x86_64 %{arm}
@@ -82,7 +82,7 @@ golang development libraries for etcd, a highly-available key
value store for
shared configuration.
%prep
-%setup -qn %{name}-%{version}-rc.1
+%setup -qn %{name}-%{version}
rm -rf Godeps/_workspace/src/github.com/{codegangsta,coreos,stretchr,jonboulle}
rm -rf Godeps/_workspace/src/{code.google.com,bitbucket.org,golang.org}
@@ -95,10 +95,10 @@ find . -name *.go \
mkdir -p src/github.com/coreos
ln -s ../../../ src/github.com/coreos/etcd
-export GOPATH=%{gopath}:$(pwd):$(pwd)/Godeps/_workspace:$GOPATH
+export GOPATH=$(pwd):%{gopath}:$GOPATH
go build -v -x -o bin/etcd %{import_path}
go build -a -ldflags '-s' -o bin/etcdctl %{import_path}/etcdctl
-go build -v -x -o bin/etcd-migrate %{import_path}/migrate/cmd/%{name}-migrate
+go build -v -x -o bin/etcd-migrate %{import_path}/tools/%{name}-migrate
%install
@@ -122,20 +122,20 @@ do
done
%check
-export GOPATH=%{gopath}:%{buildroot}%{gopath}:$(pwd)/Godeps/_workspace
+export GOPATH=%{buildroot}%{gopath}:%{gopath}
go test %{import_path}/client
go test %{import_path}/discovery
go test %{import_path}/error
go test %{import_path}/etcdctl/command
go test %{import_path}/etcdmain
-go test %{import_path}/etcdserver
+#go test %{import_path}/etcdserver
#go test %{import_path}/etcdserver/etcdhttp
#go test %{import_path}/etcdserver/etcdhttp/httptypes
#go test %{import_path}/integration
go test %{import_path}/migrate
#go test %{import_path}/pkg/fileutil
go test %{import_path}/pkg/flags
-go test %{import_path}/pkg/ioutils
+go test %{import_path}/pkg/ioutil
go test %{import_path}/pkg/transport
go test %{import_path}/pkg/types
go test %{import_path}/pkg/wait
@@ -175,6 +175,11 @@ getent passwd %{name} /dev/null || useradd -r -g %{name}
-d %{_sharedstatedir}/
%{gopath}/src/%{import_path}
%changelog
+* Fri Jan 30 2015 jchaloup jchal...@redhat.com - 2.0.0-0.4
+- Update to etcd-2.0.0
+- use gopath as the last directory to search for source code
+ related: #1176138
+
* Tue Jan 20 2015 jchaloup jchal...@redhat.com - 2.0.0-0.2.rc1
- Update of BuildRequires/Requires, Provides and test
Add BuildRequire on jonboulle/clockwork
diff --git a/sources b/sources
index 316191f..c57d792 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b34a42260e32e32913d137cd60ec80ca v2.0.0-rc.1.tar.gz
+c9da6b748a6582763f4f9dcb89cec60e v2.0.0.tar.gz
___
golang mailing list
golang@lists.fedoraproject.org
https://lists.fedoraproject.org/mailman/listinfo/golang
[etcd/f21] Update to 2.0.1 - resolves: #1191441
commit 1062f57a037f451ac0545a10aba6b5ed480fc094
Author: Jan Chaloupka jchal...@redhat.com
Date: Wed Feb 11 13:00:46 2015 +0100
Update to 2.0.1
- resolves: #1191441
.gitignore | 2 +-
etcd.spec | 8 ++--
sources| 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 06bc6b5..eaa3a1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/v2.0.0.tar.gz
+/v2.0.1.tar.gz
diff --git a/etcd.spec b/etcd.spec
index fbea03e..809390a 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -8,8 +8,8 @@
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
Name: %{repo}
-Version: 2.0.0
-Release: 0.5%{?dist}
+Version: 2.0.1
+Release: 0.1%{?dist}
Summary: A highly-available key value store for shared configuration
License: ASL 2.0
URL: https://%{import_path}
@@ -178,6 +178,10 @@ getent passwd %{name} /dev/null || useradd -r -g %{name}
-d %{_sharedstatedir}/
%{gopath}/src/%{import_path}
%changelog
+* Wed Feb 11 2015 jchaloup jchal...@redhat.com - 2.0.1-0.1
+- Update to 2.0.1
+ resolves: #1191441
+
* Mon Feb 09 2015 jchaloup jchal...@redhat.com - 2.0.0-0.5
- Add missing debug info to binaries (patch from Jan Kratochvil)
resolves: #1184257
diff --git a/sources b/sources
index c57d792..5c97401 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c9da6b748a6582763f4f9dcb89cec60e v2.0.0.tar.gz
+4c71e54f50553d6f7858e065f27d9578 v2.0.1.tar.gz
___
golang mailing list
golang@lists.fedoraproject.org
https://lists.fedoraproject.org/mailman/listinfo/golang
[etcd/f21] rhbz#1176138 - update to v2.0.0-rc.1
commit ebae72f92f3554f24625d412f5f0571c89804966
Author: Lokesh Mandvekar l...@fedoraproject.org
Date: Fri Jan 2 07:52:53 2015 +
rhbz#1176138 - update to v2.0.0-rc.1
NVR: etcd-2.0.0-1.rc1 (not built in koji yet)
This commit doesn't solve resolve rhbz#1176138 completely, as the package
update isn't quite working as expected. More work is needed on this.
Signed-off-by: Lokesh Mandvekar l...@fedoraproject.org
.gitignore |1 +
0001-De-bundle-third_party.patch | 1405 --
etcd.service |2 +-
etcd.spec| 172 +++--
sources |2 +-
5 files changed, 111 insertions(+), 1471 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index be5ca1e..2d72061 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/clog
/etcd-0.4.6.tar.gz
+/v2.0.0-rc.1.tar.gz
diff --git a/etcd.service b/etcd.service
index fd5733c..85c5953 100644
--- a/etcd.service
+++ b/etcd.service
@@ -6,7 +6,7 @@ After=network.target
Type=simple
# etc logs to the journal directly, suppress double logging
StandardOutput=null
-WorkingDirectory=/var/lib/etcd
+WorkingDirectory=/var/lib/etcd/`$hostname`.etcd
User=etcd
ExecStart=/usr/bin/etcd
diff --git a/etcd.spec b/etcd.spec
index 008990d..180501d 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -1,31 +1,35 @@
-%global debug_package %{nil}
-%global import_path github.com/coreos/etcd
-%global gopath %{_datadir}/gocode
+%global debug_package %{nil}
+%global providergithub
+%global provider_tldcom
+%global project coreos
+%global repoetcd
-Name: etcd
-Version: 0.4.6
-Release: 8%{?dist}
-Summary: A highly-available key value store for shared configuration
+%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
+Name: %{repo}
+Version: 2.0.0
+Release: 1.rc1%{?dist}
+Summary: A highly-available key value store for shared configuration
License: ASL 2.0
-URL: https://github.com/coreos/etcd/
-Source0:
https://github.com/coreos/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
-Source1: etcd.service
-Source2: etcd.conf
-Patch0: 0001-De-bundle-third_party.patch
+URL: https://%{import_path}
+Source0: https://%{import_path}/archive/v%{version}-rc.1.tar.gz
+Source1: %{name}.service
+Source2: %{name}.conf
ExclusiveArch: %{ix86} x86_64 %{arm}
-BuildRequires: golang
+BuildRequires: golang = 1.3.3
+BuildRequires: golang(bitbucket.org/kardianos/osext)
BuildRequires: golang(code.google.com/p/gogoprotobuf)
BuildRequires: golang(github.com/BurntSushi/toml)
-BuildRequires: golang(github.com/gorilla/mux)
-BuildRequires: golang(github.com/mreiferson/go-httpclient)
-BuildRequires: golang(bitbucket.org/kardianos/osext)
+BuildRequires: golang(github.com/codegangsta/cli)
+BuildRequires: golang(github.com/coreos/go-etcd/etcd)
BuildRequires: golang(github.com/coreos/go-log/log)
BuildRequires: golang(github.com/coreos/go-systemd)
+BuildRequires: golang(github.com/gorilla/mux)
+BuildRequires: golang(github.com/mreiferson/go-httpclient)
BuildRequires: golang(github.com/rcrowley/go-metrics)
+BuildRequires: golang(golang.org/x/net/context)
BuildRequires: systemd
-
Requires(pre): shadow-utils
Requires(post): systemd
Requires(preun): systemd
@@ -35,77 +39,111 @@ Requires(postun): systemd
A highly-available key value store for shared configuration.
%package devel
-BuildRequires: golang
+BuildRequires: golang = 1.2.1-3
+BuildRequires: golang(bitbucket.org/kardianos/osext)
BuildRequires: golang(code.google.com/p/gogoprotobuf)
BuildRequires: golang(github.com/BurntSushi/toml)
-BuildRequires: golang(github.com/gorilla/mux)
-BuildRequires: golang(github.com/mreiferson/go-httpclient)
-BuildRequires: golang(bitbucket.org/kardianos/osext)
BuildRequires: golang(github.com/coreos/go-log/log)
BuildRequires: golang(github.com/coreos/go-systemd)
+BuildRequires: golang(github.com/gorilla/mux)
+BuildRequires: golang(github.com/mreiferson/go-httpclient)
BuildRequires: golang(github.com/rcrowley/go-metrics)
-Requires: golang
-Summary:etcd golang devel libraries
-Provides: golang(%{import_path}) = %{version}-%{release}
+BuildRequires: golang(github.com/stretchr/testify/assert)
+Requires: golang = 1.2.1-3
+Provides: golang(%{import_path}) = %{version}-%{release}
+Provides: golang(%{import_path}/client) = %{version}-%{release}
+Provides: golang(%{import_path}/discovery) = %{version}-%{release}
+Provides: golang(%{import_path}/error) = %{version}-%{release}
+Provides: golang(%{import_path}/etcdmain) = %{version}-%{release}
+Provides: golang(%{import_path}/etcdserver) = %{version}-%{release}
+Provides: golang(%{import_path}/migrate) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/cors) =
[etcd/f21] Add ExclusiveArch for go_arches
commit 25a0f4aa5e34210978e2e018926958d764fa6a65
Author: Jan Chaloupka jchal...@redhat.com
Date: Fri Oct 17 13:26:12 2014 +0200
Add ExclusiveArch for go_arches
etcd.spec | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/etcd.spec b/etcd.spec
index 803c1d9..008990d 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -4,7 +4,7 @@
Name: etcd
Version: 0.4.6
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: A highly-available key value store for shared configuration
License: ASL 2.0
@@ -13,6 +13,7 @@ Source0:
https://github.com/coreos/%{name}/archive/v%{version}/%{name}-%{version
Source1: etcd.service
Source2: etcd.conf
Patch0: 0001-De-bundle-third_party.patch
+ExclusiveArch: %{ix86} x86_64 %{arm}
BuildRequires: golang
BuildRequires: golang(code.google.com/p/gogoprotobuf)
@@ -128,6 +129,9 @@ getent passwd etcd /dev/null || useradd -r -g etcd -d
%{_localstatedir}/lib/etc
%{gopath}/src/%{import_path}/*
%changelog
+* Fri Oct 17 2014 jchaloup jchal...@redhat.com - 0.4.6-8
+- Add ExclusiveArch for go_arches
+
* Wed Jan 21 2015 Eric Paris epa...@redhat.com - 0.4.6-7
- default to /var/lib/etcd/default.etcd as 2.0 uses that default
___
golang mailing list
golang@lists.fedoraproject.org
https://lists.fedoraproject.org/mailman/listinfo/golang
[etcd/f21] Update of BuildRequires/Requires, Provides and test Add BuildRequire on jonboulle/clockwork - relate
commit b0027bdbdda0da9f25832af82b804ae18c1561ae
Author: Jan Chaloupka jchal...@redhat.com
Date: Tue Jan 20 14:33:18 2015 +0100
Update of BuildRequires/Requires, Provides and test
Add BuildRequire on jonboulle/clockwork
- related: #1176138
etcd.spec | 102 +++---
1 file changed, 57 insertions(+), 45 deletions(-)
---
diff --git a/etcd.spec b/etcd.spec
index 180501d..8661e10 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -8,7 +8,7 @@
Name: %{repo}
Version: 2.0.0
-Release: 1.rc1%{?dist}
+Release: 0.2.rc1%{?dist}
Summary: A highly-available key value store for shared configuration
License: ASL 2.0
URL: https://%{import_path}
@@ -18,17 +18,12 @@ Source2:%{name}.conf
ExclusiveArch: %{ix86} x86_64 %{arm}
BuildRequires: golang = 1.3.3
-BuildRequires: golang(bitbucket.org/kardianos/osext)
BuildRequires: golang(code.google.com/p/gogoprotobuf)
-BuildRequires: golang(github.com/BurntSushi/toml)
BuildRequires: golang(github.com/codegangsta/cli)
BuildRequires: golang(github.com/coreos/go-etcd/etcd)
-BuildRequires: golang(github.com/coreos/go-log/log)
-BuildRequires: golang(github.com/coreos/go-systemd)
-BuildRequires: golang(github.com/gorilla/mux)
-BuildRequires: golang(github.com/mreiferson/go-httpclient)
-BuildRequires: golang(github.com/rcrowley/go-metrics)
BuildRequires: golang(golang.org/x/net/context)
+BuildRequires: golang(github.com/jonboulle/clockwork)
+BuildRequires: golang(github.com/stretchr/testify/assert)
BuildRequires: systemd
Requires(pre): shadow-utils
Requires(post): systemd
@@ -40,40 +35,47 @@ A highly-available key value store for shared configuration.
%package devel
BuildRequires: golang = 1.2.1-3
-BuildRequires: golang(bitbucket.org/kardianos/osext)
-BuildRequires: golang(code.google.com/p/gogoprotobuf)
-BuildRequires: golang(github.com/BurntSushi/toml)
-BuildRequires: golang(github.com/coreos/go-log/log)
-BuildRequires: golang(github.com/coreos/go-systemd)
-BuildRequires: golang(github.com/gorilla/mux)
-BuildRequires: golang(github.com/mreiferson/go-httpclient)
-BuildRequires: golang(github.com/rcrowley/go-metrics)
+BuildRequires: golang(code.google.com/p/gogoprotobuf)
+BuildRequires: golang(github.com/codegangsta/cli)
+BuildRequires: golang(github.com/coreos/go-etcd/etcd)
+BuildRequires: golang(golang.org/x/net/context)
+BuildRequires: golang(github.com/jonboulle/clockwork)
BuildRequires: golang(github.com/stretchr/testify/assert)
Requires: golang = 1.2.1-3
-Provides: golang(%{import_path}) = %{version}-%{release}
-Provides: golang(%{import_path}/client) = %{version}-%{release}
-Provides: golang(%{import_path}/discovery) = %{version}-%{release}
-Provides: golang(%{import_path}/error) = %{version}-%{release}
-Provides: golang(%{import_path}/etcdmain) = %{version}-%{release}
-Provides: golang(%{import_path}/etcdserver) = %{version}-%{release}
-Provides: golang(%{import_path}/migrate) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/cors) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/crc) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/fileutil) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/flags) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/ioutils) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/pbutil) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/testutil) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/transport) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/types) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/wait) = %{version}-%{release}
-Provides: golang(%{import_path}/proxy) = %{version}-%{release}
-Provides: golang(%{import_path}/raft) = %{version}-%{release}
-Provides: golang(%{import_path}/rafthttp) = %{version}-%{release}
-Provides: golang(%{import_path}/snap) = %{version}-%{release}
-Provides: golang(%{import_path}/store) = %{version}-%{release}
-Provides: golang(%{import_path}/wal) = %{version}-%{release}
-Summary:etcd golang devel libraries
+Provides: golang(%{import_path}) = %{version}-%{release}
+Provides: golang(%{import_path}/client) = %{version}-%{release}
+Provides: golang(%{import_path}/discovery) = %{version}-%{release}
+Provides: golang(%{import_path}/error) = %{version}-%{release}
+Provides: golang(%{import_path}/etcdctl) = %{version}-%{release}
+Provides: golang(%{import_path}/etcdctl/command) = %{version}-%{release}
+Provides: golang(%{import_path}/etcdmain) = %{version}-%{release}
+Provides: golang(%{import_path}/etcdserver) = %{version}-%{release}
+Provides: golang(%{import_path}/etcdserver/etcdhttp) =
%{version}-%{release}
+Provides: golang(%{import_path}/etcdserver/etcdhttp/httptypes) =
%{version}-%{release}
+Provides:
[etcd/f20] rhbz#1176138 - update to v2.0.0-rc.1
commit 17eda4cff5374617a07fd1c12e506ae11bab533f
Author: Lokesh Mandvekar l...@fedoraproject.org
Date: Fri Jan 2 07:52:53 2015 +
rhbz#1176138 - update to v2.0.0-rc.1
NVR: etcd-2.0.0-1.rc1 (not built in koji yet)
This commit doesn't solve resolve rhbz#1176138 completely, as the package
update isn't quite working as expected. More work is needed on this.
Signed-off-by: Lokesh Mandvekar l...@fedoraproject.org
.gitignore |1 +
0001-De-bundle-third_party.patch | 1405 --
etcd.service |2 +-
etcd.spec| 173 +++--
sources |2 +-
5 files changed, 111 insertions(+), 1472 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e194d9d..80bc215 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/etcd-0.4.6.tar.gz
+/v2.0.0-rc.1.tar.gz
diff --git a/etcd.service b/etcd.service
index fd5733c..85c5953 100644
--- a/etcd.service
+++ b/etcd.service
@@ -6,7 +6,7 @@ After=network.target
Type=simple
# etc logs to the journal directly, suppress double logging
StandardOutput=null
-WorkingDirectory=/var/lib/etcd
+WorkingDirectory=/var/lib/etcd/`$hostname`.etcd
User=etcd
ExecStart=/usr/bin/etcd
diff --git a/etcd.spec b/etcd.spec
index 77be769..87805e5 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -1,30 +1,33 @@
-%global debug_package %{nil}
-%global import_path github.com/coreos/etcd
-%global gopath %{_datadir}/gocode
+%global debug_package %{nil}
+%global providergithub
+%global provider_tldcom
+%global project coreos
+%global repoetcd
-Name: etcd
-Version: 0.4.6
-Release: 7%{?dist}
-Summary: A highly-available key value store for shared configuration
+%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
+Name: %{repo}
+Version: 2.0.0
+Release: 1.rc1%{?dist}
+Summary: A highly-available key value store for shared configuration
License: ASL 2.0
-URL: https://github.com/coreos/etcd/
-Source0:
https://github.com/coreos/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
-Source1: etcd.service
-Source2: etcd.conf
-Patch0: 0001-De-bundle-third_party.patch
-
-BuildRequires: golang
+URL: https://%{import_path}
+Source0: https://%{import_path}/archive/v%{version}-rc.1.tar.gz
+Source1: %{name}.service
+Source2: %{name}.conf
+BuildRequires: golang = 1.3.3
+BuildRequires: golang(bitbucket.org/kardianos/osext)
BuildRequires: golang(code.google.com/p/gogoprotobuf)
BuildRequires: golang(github.com/BurntSushi/toml)
-BuildRequires: golang(github.com/gorilla/mux)
-BuildRequires: golang(github.com/mreiferson/go-httpclient)
-BuildRequires: golang(bitbucket.org/kardianos/osext)
+BuildRequires: golang(github.com/codegangsta/cli)
+BuildRequires: golang(github.com/coreos/go-etcd/etcd)
BuildRequires: golang(github.com/coreos/go-log/log)
BuildRequires: golang(github.com/coreos/go-systemd)
+BuildRequires: golang(github.com/gorilla/mux)
+BuildRequires: golang(github.com/mreiferson/go-httpclient)
BuildRequires: golang(github.com/rcrowley/go-metrics)
+BuildRequires: golang(golang.org/x/net/context)
BuildRequires: systemd
-
Requires(pre): shadow-utils
Requires(post): systemd
Requires(preun): systemd
@@ -34,18 +37,41 @@ Requires(postun): systemd
A highly-available key value store for shared configuration.
%package devel
-BuildRequires: golang
+BuildRequires: golang = 1.2.1-3
+BuildRequires: golang(bitbucket.org/kardianos/osext)
BuildRequires: golang(code.google.com/p/gogoprotobuf)
BuildRequires: golang(github.com/BurntSushi/toml)
-BuildRequires: golang(github.com/gorilla/mux)
-BuildRequires: golang(github.com/mreiferson/go-httpclient)
-BuildRequires: golang(bitbucket.org/kardianos/osext)
BuildRequires: golang(github.com/coreos/go-log/log)
BuildRequires: golang(github.com/coreos/go-systemd)
+BuildRequires: golang(github.com/gorilla/mux)
+BuildRequires: golang(github.com/mreiferson/go-httpclient)
BuildRequires: golang(github.com/rcrowley/go-metrics)
-Requires: golang
-Summary:etcd golang devel libraries
-Provides: golang(%{import_path}) = %{version}-%{release}
+BuildRequires: golang(github.com/stretchr/testify/assert)
+Requires: golang = 1.2.1-3
+Provides: golang(%{import_path}) = %{version}-%{release}
+Provides: golang(%{import_path}/client) = %{version}-%{release}
+Provides: golang(%{import_path}/discovery) = %{version}-%{release}
+Provides: golang(%{import_path}/error) = %{version}-%{release}
+Provides: golang(%{import_path}/etcdmain) = %{version}-%{release}
+Provides: golang(%{import_path}/etcdserver) = %{version}-%{release}
+Provides: golang(%{import_path}/migrate) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/cors) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/crc) =
[etcd/f20] default to /var/lib/etcd/default.etcd as 2.0 uses that default (f21 commit byt eparis) - related: #1
commit 76b8f494d34ab91533ff800e7d28d9ac85a7c8f0
Author: Jan Chaloupka jchal...@redhat.com
Date: Mon Jan 26 13:53:26 2015 +0100
default to /var/lib/etcd/default.etcd as 2.0 uses that default (f21 commit
byt eparis)
- related: #1176138
etcd.conf | 4 ++--
etcd.spec | 10 --
2 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/etcd.conf b/etcd.conf
index 1b43f65..4d5d50e 100644
--- a/etcd.conf
+++ b/etcd.conf
@@ -6,7 +6,7 @@
# cert_file =
# cors = []
# cpu_profile_file =
-# data_dir = .
+data_dir = /var/lib/etcd/default.etcd
# discovery = http://etcd.local:4001/v2/keys/_etcd/registry/examplecluster;
# http_read_timeout = 10
# http_write_timeout = 10
@@ -16,7 +16,7 @@
# max_cluster_size = 9
# max_result_buffer = 1024
# max_retry_attempts = 3
-# name = default-name
+name = default
# snapshot = false
# verbose = false
# very_verbose = false
diff --git a/etcd.spec b/etcd.spec
index 30caad5..e063fb3 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -8,7 +8,7 @@
Name: %{repo}
Version: 2.0.0
-Release: 0.2.rc1%{?dist}
+Release: 0.3.rc1%{?dist}
Summary: A highly-available key value store for shared configuration
License: ASL 2.0
URL: https://%{import_path}
@@ -104,7 +104,8 @@ install -D -p -m 0755 bin/%{name}
%{buildroot}%{_bindir}/%{name}
install -D -p -m 0755 bin/%{name}ctl %{buildroot}%{_bindir}/%{name}ctl
install -D -p -m 0755 bin/%{name}-migrate
%{buildroot}%{_bindir}/%{name}-migrate
install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
-install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}
+install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}
+install -m 644 -t %{buildroot}%{_sysconfdir}/%{name} %{SOURCE2}
# And create /var/lib/etcd
install -d -m 0755 %{buildroot}%{_sharedstatedir}/%{name}
@@ -173,6 +174,11 @@ getent passwd %{name} /dev/null || useradd -r -g %{name}
-d %{_sharedstatedir}/
%{gopath}/src/%{import_path}
%changelog
+* Mon Jan 26 2015 jchaloup jchal...@redhat.com - 2.0.0-0.3.rc1
+- default to /var/lib/etcd/default.etcd as 2.0 uses that default (f21 commit
byt eparis)
+ related: #1176138
+ fix /etc/etcd/etcd.conf path
+
* Tue Jan 20 2015 jchaloup jchal...@redhat.com - 2.0.0-0.2.rc1
- Update of BuildRequires/Requires, Provides and test
Add BuildRequire on jonboulle/clockwork
___
golang mailing list
golang@lists.fedoraproject.org
https://lists.fedoraproject.org/mailman/listinfo/golang
[etcd/f20] Bump to upstream 4d728cc8c488a545a8bdeafd054d9ccc2bfb6876
commit bfce6fcd55269508e6f39ea3a496d8fe6d078a6f
Author: Jan Chaloupka jchal...@redhat.com
Date: Fri Feb 20 12:08:11 2015 +0100
Bump to upstream 4d728cc8c488a545a8bdeafd054d9ccc2bfb6876
.gitignore | 2 +-
etcd.spec | 26 ++
sources| 2 +-
3 files changed, 20 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eaa3a1f..5f01d7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/v2.0.1.tar.gz
+/v2.0.3.tar.gz
diff --git a/etcd.spec b/etcd.spec
index 180c907..21ce879 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -1,15 +1,17 @@
# https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12
-%global _dwz_low_mem_die_limit 0
+#%global _dwz_low_mem_die_limit 0
+%global debug_package %{nil}
%global providergithub
%global provider_tldcom
%global project coreos
%global repoetcd
+%global commit 4d728cc8c488a545a8bdeafd054d9ccc2bfb6876
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
Name: %{repo}
-Version: 2.0.1
-Release: 0.2%{?dist}
+Version: 2.0.3
+Release: 0.1%{?dist}
Summary: A highly-available key value store for shared configuration
License: ASL 2.0
URL: https://%{import_path}
@@ -102,10 +104,13 @@ ln -s ../../../ src/github.com/coreos/etcd
export GOPATH=$(pwd):%{gopath}:$GOPATH
# *** ERROR: No build ID note found in
/.../BUILDROOT/etcd-2.0.0-1.rc1.fc22.x86_64/usr/bin/etcd
-function gobuild { go build -a -ldflags -B 0x$(head -c20 /dev/urandom|od -An
-tx1|tr -d ' \n') -v -x $@; }
-gobuild -o bin/etcd %{import_path}
-gobuild -o bin/etcdctl %{import_path}/etcdctl
-gobuild -o bin/etcd-migrate %{import_path}/tools/%{name}-migrate
+#function gobuild { go build -a -ldflags -B 0x$(head -c20 /dev/urandom|od -An
-tx1|tr -d ' \n') -v -x $@; }
+#gobuild -o bin/etcd %{import_path}
+#gobuild -o bin/etcdctl %{import_path}/etcdctl
+#gobuild -o bin/etcd-migrate %{import_path}/tools/%{name}-migrate
+go build -v -x -o bin/etcd %{import_path}
+go build -a -ldflags '-s' -o bin/etcdctl %{import_path}/etcdctl
+go build -v -x -o bin/etcd-migrate %{import_path}/tools/%{name}-migrate
%install
@@ -145,7 +150,7 @@ go test %{import_path}/migrate
#go test %{import_path}/pkg/fileutil
go test %{import_path}/pkg/flags
go test %{import_path}/pkg/ioutil
-go test %{import_path}/pkg/transport
+#go test %{import_path}/pkg/transport
go test %{import_path}/pkg/types
go test %{import_path}/pkg/wait
go test %{import_path}/proxy
@@ -184,6 +189,11 @@ getent passwd %{name} /dev/null || useradd -r -g %{name}
-d %{_sharedstatedir}/
%{gopath}/src/%{import_path}
%changelog
+* Fri Feb 20 2015 jchaloup jchal...@redhat.com - 2.0.3-0.1
+- Bump to upstream 4d728cc8c488a545a8bdeafd054d9ccc2bfb6876
+ remove debug info until 1196571 is resolved
+ related: #1191441
+
* Wed Feb 18 2015 jchaloup jchal...@redhat.com - 2.0.1-0.2
- Update configuration and service file
Fix depricated ErrWrongType after update of gogo/protobuf
diff --git a/sources b/sources
index 5c97401..68388d5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4c71e54f50553d6f7858e065f27d9578 v2.0.1.tar.gz
+074158742a7242b650988e5f70937362 v2.0.3.tar.gz
___
golang mailing list
golang@lists.fedoraproject.org
https://lists.fedoraproject.org/mailman/listinfo/golang
[etcd/f20] Add missing debug info to binaries (patch from Jan Kratochvil) - resolves: #1184257
commit 6859cad2b33e00df90832a4d530b429280c81386
Author: Jan Chaloupka jchal...@redhat.com
Date: Mon Feb 9 10:12:35 2015 +0100
Add missing debug info to binaries (patch from Jan Kratochvil)
- resolves: #1184257
etcd.spec | 18 +-
1 file changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/etcd.spec b/etcd.spec
index ae2ef6f..e8858f8 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -1,4 +1,5 @@
-%global debug_package %{nil}
+# https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12
+%global _dwz_low_mem_die_limit 0
%global providergithub
%global provider_tldcom
%global project coreos
@@ -8,13 +9,14 @@
Name: %{repo}
Version: 2.0.0
-Release: 0.4%{?dist}
+Release: 0.5%{?dist}
Summary: A highly-available key value store for shared configuration
License: ASL 2.0
URL: https://%{import_path}
Source0: https://%{import_path}/archive/v%{version}.tar.gz
Source1: %{name}.service
Source2: %{name}.conf
+ExclusiveArch: %{ix86} x86_64 %{arm}
BuildRequires: golang = 1.3.3
BuildRequires: golang(code.google.com/p/gogoprotobuf)
BuildRequires: golang(github.com/codegangsta/cli)
@@ -94,9 +96,11 @@ mkdir -p src/github.com/coreos
ln -s ../../../ src/github.com/coreos/etcd
export GOPATH=$(pwd):%{gopath}:$GOPATH
-go build -v -x -o bin/etcd %{import_path}
-go build -a -ldflags '-s' -o bin/etcdctl %{import_path}/etcdctl
-go build -v -x -o bin/etcd-migrate %{import_path}/tools/%{name}-migrate
+# *** ERROR: No build ID note found in
/.../BUILDROOT/etcd-2.0.0-1.rc1.fc22.x86_64/usr/bin/etcd
+function gobuild { go build -a -ldflags -B 0x$(head -c20 /dev/urandom|od -An
-tx1|tr -d ' \n') -v -x $@; }
+gobuild -o bin/etcd %{import_path}
+gobuild -o bin/etcdctl %{import_path}/etcdctl
+gobuild -o bin/etcd-migrate %{import_path}/tools/%{name}-migrate
%install
@@ -174,6 +178,10 @@ getent passwd %{name} /dev/null || useradd -r -g %{name}
-d %{_sharedstatedir}/
%{gopath}/src/%{import_path}
%changelog
+* Mon Feb 09 2015 jchaloup jchal...@redhat.com - 2.0.0-0.5
+- Add missing debug info to binaries (patch from Jan Kratochvil)
+ resolves: #1184257
+
* Fri Jan 30 2015 jchaloup jchal...@redhat.com - 2.0.0-0.4
- Update to etcd-2.0.0
- use gopath as the last directory to search for source code
___
golang mailing list
golang@lists.fedoraproject.org
https://lists.fedoraproject.org/mailman/listinfo/golang
[etcd/f20] Update to 2.0.1 - resolves: #1191441
commit 68d7c9c33ea939a98399b1786cd4f374d6b5d479
Author: Jan Chaloupka jchal...@redhat.com
Date: Wed Feb 11 13:00:46 2015 +0100
Update to 2.0.1
- resolves: #1191441
.gitignore | 2 +-
etcd.spec | 8 ++--
sources| 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 06bc6b5..eaa3a1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/v2.0.0.tar.gz
+/v2.0.1.tar.gz
diff --git a/etcd.spec b/etcd.spec
index e8858f8..5040198 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -8,8 +8,8 @@
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
Name: %{repo}
-Version: 2.0.0
-Release: 0.5%{?dist}
+Version: 2.0.1
+Release: 0.1%{?dist}
Summary: A highly-available key value store for shared configuration
License: ASL 2.0
URL: https://%{import_path}
@@ -178,6 +178,10 @@ getent passwd %{name} /dev/null || useradd -r -g %{name}
-d %{_sharedstatedir}/
%{gopath}/src/%{import_path}
%changelog
+* Wed Feb 11 2015 jchaloup jchal...@redhat.com - 2.0.1-0.1
+- Update to 2.0.1
+ resolves: #1191441
+
* Mon Feb 09 2015 jchaloup jchal...@redhat.com - 2.0.0-0.5
- Add missing debug info to binaries (patch from Jan Kratochvil)
resolves: #1184257
diff --git a/sources b/sources
index c57d792..5c97401 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c9da6b748a6582763f4f9dcb89cec60e v2.0.0.tar.gz
+4c71e54f50553d6f7858e065f27d9578 v2.0.1.tar.gz
___
golang mailing list
golang@lists.fedoraproject.org
https://lists.fedoraproject.org/mailman/listinfo/golang
[etcd/f20] Update of BuildRequires/Requires, Provides and test Add BuildRequire on jonboulle/clockwork - relate
commit 2dedfd5c028f5932b68e3392f63df6251f631ccc
Author: Jan Chaloupka jchal...@redhat.com
Date: Tue Jan 20 14:33:18 2015 +0100
Update of BuildRequires/Requires, Provides and test
Add BuildRequire on jonboulle/clockwork
- related: #1176138
etcd.spec | 101 ++
1 file changed, 56 insertions(+), 45 deletions(-)
---
diff --git a/etcd.spec b/etcd.spec
index 87805e5..30caad5 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -8,7 +8,7 @@
Name: %{repo}
Version: 2.0.0
-Release: 1.rc1%{?dist}
+Release: 0.2.rc1%{?dist}
Summary: A highly-available key value store for shared configuration
License: ASL 2.0
URL: https://%{import_path}
@@ -16,17 +16,12 @@ Source0:
https://%{import_path}/archive/v%{version}-rc.1.tar.gz
Source1: %{name}.service
Source2: %{name}.conf
BuildRequires: golang = 1.3.3
-BuildRequires: golang(bitbucket.org/kardianos/osext)
BuildRequires: golang(code.google.com/p/gogoprotobuf)
-BuildRequires: golang(github.com/BurntSushi/toml)
BuildRequires: golang(github.com/codegangsta/cli)
BuildRequires: golang(github.com/coreos/go-etcd/etcd)
-BuildRequires: golang(github.com/coreos/go-log/log)
-BuildRequires: golang(github.com/coreos/go-systemd)
-BuildRequires: golang(github.com/gorilla/mux)
-BuildRequires: golang(github.com/mreiferson/go-httpclient)
-BuildRequires: golang(github.com/rcrowley/go-metrics)
BuildRequires: golang(golang.org/x/net/context)
+BuildRequires: golang(github.com/jonboulle/clockwork)
+BuildRequires: golang(github.com/stretchr/testify/assert)
BuildRequires: systemd
Requires(pre): shadow-utils
Requires(post): systemd
@@ -38,40 +33,46 @@ A highly-available key value store for shared configuration.
%package devel
BuildRequires: golang = 1.2.1-3
-BuildRequires: golang(bitbucket.org/kardianos/osext)
-BuildRequires: golang(code.google.com/p/gogoprotobuf)
-BuildRequires: golang(github.com/BurntSushi/toml)
-BuildRequires: golang(github.com/coreos/go-log/log)
-BuildRequires: golang(github.com/coreos/go-systemd)
-BuildRequires: golang(github.com/gorilla/mux)
-BuildRequires: golang(github.com/mreiferson/go-httpclient)
-BuildRequires: golang(github.com/rcrowley/go-metrics)
+BuildRequires: golang(code.google.com/p/gogoprotobuf)
+BuildRequires: golang(github.com/codegangsta/cli)
+BuildRequires: golang(github.com/coreos/go-etcd/etcd)
+BuildRequires: golang(golang.org/x/net/context)
+BuildRequires: golang(github.com/jonboulle/clockwork)
BuildRequires: golang(github.com/stretchr/testify/assert)
Requires: golang = 1.2.1-3
-Provides: golang(%{import_path}) = %{version}-%{release}
-Provides: golang(%{import_path}/client) = %{version}-%{release}
-Provides: golang(%{import_path}/discovery) = %{version}-%{release}
-Provides: golang(%{import_path}/error) = %{version}-%{release}
-Provides: golang(%{import_path}/etcdmain) = %{version}-%{release}
-Provides: golang(%{import_path}/etcdserver) = %{version}-%{release}
-Provides: golang(%{import_path}/migrate) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/cors) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/crc) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/fileutil) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/flags) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/ioutils) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/pbutil) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/testutil) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/transport) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/types) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/wait) = %{version}-%{release}
-Provides: golang(%{import_path}/proxy) = %{version}-%{release}
-Provides: golang(%{import_path}/raft) = %{version}-%{release}
-Provides: golang(%{import_path}/rafthttp) = %{version}-%{release}
-Provides: golang(%{import_path}/snap) = %{version}-%{release}
-Provides: golang(%{import_path}/store) = %{version}-%{release}
-Provides: golang(%{import_path}/wal) = %{version}-%{release}
-Summary:etcd golang devel libraries
+Provides: golang(%{import_path}) = %{version}-%{release}
+Provides: golang(%{import_path}/client) = %{version}-%{release}
+Provides: golang(%{import_path}/discovery) = %{version}-%{release}
+Provides: golang(%{import_path}/error) = %{version}-%{release}
+Provides: golang(%{import_path}/etcdctl) = %{version}-%{release}
+Provides: golang(%{import_path}/etcdctl/command) = %{version}-%{release}
+Provides: golang(%{import_path}/etcdmain) = %{version}-%{release}
+Provides: golang(%{import_path}/etcdserver) = %{version}-%{release}
+Provides: golang(%{import_path}/etcdserver/etcdhttp) =
%{version}-%{release}
+Provides: golang(%{import_path}/etcdserver/etcdhttp/httptypes) =
[etcd/f20] Add ExclusiveArch for go_arches
commit d98da46285babacc224172309d22101d51dd415f
Author: Jan Chaloupka jchal...@redhat.com
Date: Fri Oct 17 13:26:12 2014 +0200
Add ExclusiveArch for go_arches
etcd.spec | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/etcd.spec b/etcd.spec
index 197715b..77be769 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -4,7 +4,7 @@
Name: etcd
Version: 0.4.6
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: A highly-available key value store for shared configuration
License: ASL 2.0
@@ -46,6 +46,7 @@ BuildRequires: golang(github.com/rcrowley/go-metrics)
Requires: golang
Summary:etcd golang devel libraries
Provides: golang(%{import_path}) = %{version}-%{release}
+ExclusiveArch: %{ix86} x86_64 %{arm}
%description devel
golang development libraries for etcd, a highly-available key value store for
@@ -128,6 +129,9 @@ getent passwd etcd /dev/null || useradd -r -g etcd -d
%{_localstatedir}/lib/etc
%{gopath}/src/%{import_path}/*
%changelog
+* Fri Oct 17 2014 jchaloup jchal...@redhat.com - 0.4.6-7
+- Add ExclusiveArch for go_arches
+
* Mon Oct 06 2014 jchaloup jchal...@redhat.com - 0.4.6-6
- related: #1047194
Remove dependency on go.net
___
golang mailing list
golang@lists.fedoraproject.org
https://lists.fedoraproject.org/mailman/listinfo/golang
[etcd/f21] Bump to upstream 4d728cc8c488a545a8bdeafd054d9ccc2bfb6876
commit 95eab8ccd76f339f8a0a77b5a580ea202ce5
Author: Jan Chaloupka jchal...@redhat.com
Date: Fri Feb 20 12:08:11 2015 +0100
Bump to upstream 4d728cc8c488a545a8bdeafd054d9ccc2bfb6876
.gitignore | 2 +-
etcd.spec | 26 ++
sources| 2 +-
3 files changed, 20 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eaa3a1f..5f01d7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/v2.0.1.tar.gz
+/v2.0.3.tar.gz
diff --git a/etcd.spec b/etcd.spec
index 69b35d1..4646a03 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -1,15 +1,17 @@
# https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12
-%global _dwz_low_mem_die_limit 0
+#%global _dwz_low_mem_die_limit 0
+%global debug_package %{nil}
%global providergithub
%global provider_tldcom
%global project coreos
%global repoetcd
+%global commit 4d728cc8c488a545a8bdeafd054d9ccc2bfb6876
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
Name: %{repo}
-Version: 2.0.1
-Release: 0.2%{?dist}
+Version: 2.0.3
+Release: 0.1%{?dist}
Summary: A highly-available key value store for shared configuration
License: ASL 2.0
URL: https://%{import_path}
@@ -103,10 +105,13 @@ ln -s ../../../ src/github.com/coreos/etcd
export GOPATH=$(pwd):%{gopath}:$GOPATH
# *** ERROR: No build ID note found in
/.../BUILDROOT/etcd-2.0.0-1.rc1.fc22.x86_64/usr/bin/etcd
-function gobuild { go build -a -ldflags -B 0x$(head -c20 /dev/urandom|od -An
-tx1|tr -d ' \n') -v -x $@; }
-gobuild -o bin/etcd %{import_path}
-gobuild -o bin/etcdctl %{import_path}/etcdctl
-gobuild -o bin/etcd-migrate %{import_path}/tools/%{name}-migrate
+#function gobuild { go build -a -ldflags -B 0x$(head -c20 /dev/urandom|od -An
-tx1|tr -d ' \n') -v -x $@; }
+#gobuild -o bin/etcd %{import_path}
+#gobuild -o bin/etcdctl %{import_path}/etcdctl
+#gobuild -o bin/etcd-migrate %{import_path}/tools/%{name}-migrate
+go build -v -x -o bin/etcd %{import_path}
+go build -a -ldflags '-s' -o bin/etcdctl %{import_path}/etcdctl
+go build -v -x -o bin/etcd-migrate %{import_path}/tools/%{name}-migrate
%install
@@ -145,7 +150,7 @@ go test %{import_path}/migrate
#go test %{import_path}/pkg/fileutil
go test %{import_path}/pkg/flags
go test %{import_path}/pkg/ioutil
-go test %{import_path}/pkg/transport
+#go test %{import_path}/pkg/transport
go test %{import_path}/pkg/types
go test %{import_path}/pkg/wait
go test %{import_path}/proxy
@@ -184,6 +189,11 @@ getent passwd %{name} /dev/null || useradd -r -g %{name}
-d %{_sharedstatedir}/
%{gopath}/src/%{import_path}
%changelog
+* Fri Feb 20 2015 jchaloup jchal...@redhat.com - 2.0.3-0.1
+- Bump to upstream 4d728cc8c488a545a8bdeafd054d9ccc2bfb6876
+ remove debug info until 1196571 is resolved
+ related: #1191441
+
* Wed Feb 18 2015 jchaloup jchal...@redhat.com - 2.0.1-0.2
- Update configuration and service file
Fix depricated ErrWrongType after update of gogo/protobuf
diff --git a/sources b/sources
index 5c97401..68388d5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4c71e54f50553d6f7858e065f27d9578 v2.0.1.tar.gz
+074158742a7242b650988e5f70937362 v2.0.3.tar.gz
___
golang mailing list
golang@lists.fedoraproject.org
https://lists.fedoraproject.org/mailman/listinfo/golang
[etcd/f20] Update to etcd-2.0.0 - related: #1176138
commit 6cafb68943e45a26e26b46082cf8ed7da2b4a9e1
Author: Jan Chaloupka jchal...@redhat.com
Date: Fri Jan 30 15:42:04 2015 +0100
Update to etcd-2.0.0
- related: #1176138
.gitignore | 3 +--
etcd.spec | 21 +
sources| 2 +-
3 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 80bc215..06bc6b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/etcd-0.4.6.tar.gz
-/v2.0.0-rc.1.tar.gz
+/v2.0.0.tar.gz
diff --git a/etcd.spec b/etcd.spec
index e063fb3..ae2ef6f 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -8,11 +8,11 @@
Name: %{repo}
Version: 2.0.0
-Release: 0.3.rc1%{?dist}
+Release: 0.4%{?dist}
Summary: A highly-available key value store for shared configuration
License: ASL 2.0
URL: https://%{import_path}
-Source0: https://%{import_path}/archive/v%{version}-rc.1.tar.gz
+Source0: https://%{import_path}/archive/v%{version}.tar.gz
Source1: %{name}.service
Source2: %{name}.conf
BuildRequires: golang = 1.3.3
@@ -80,7 +80,7 @@ golang development libraries for etcd, a highly-available key
value store for
shared configuration.
%prep
-%setup -qn %{name}-%{version}-rc.1
+%setup -qn %{name}-%{version}
rm -rf Godeps/_workspace/src/github.com/{codegangsta,coreos,stretchr,jonboulle}
rm -rf Godeps/_workspace/src/{code.google.com,bitbucket.org,golang.org}
@@ -93,10 +93,10 @@ find . -name *.go \
mkdir -p src/github.com/coreos
ln -s ../../../ src/github.com/coreos/etcd
-export GOPATH=%{gopath}:$(pwd):$(pwd)/Godeps/_workspace:$GOPATH
+export GOPATH=$(pwd):%{gopath}:$GOPATH
go build -v -x -o bin/etcd %{import_path}
go build -a -ldflags '-s' -o bin/etcdctl %{import_path}/etcdctl
-go build -v -x -o bin/etcd-migrate %{import_path}/migrate/cmd/%{name}-migrate
+go build -v -x -o bin/etcd-migrate %{import_path}/tools/%{name}-migrate
%install
@@ -121,20 +121,20 @@ do
done
%check
-export GOPATH=%{gopath}:%{buildroot}%{gopath}:$(pwd)/Godeps/_workspace
+export GOPATH=%{buildroot}%{gopath}:%{gopath}
go test %{import_path}/client
go test %{import_path}/discovery
go test %{import_path}/error
go test %{import_path}/etcdctl/command
go test %{import_path}/etcdmain
-go test %{import_path}/etcdserver
+#go test %{import_path}/etcdserver
#go test %{import_path}/etcdserver/etcdhttp
#go test %{import_path}/etcdserver/etcdhttp/httptypes
#go test %{import_path}/integration
go test %{import_path}/migrate
#go test %{import_path}/pkg/fileutil
go test %{import_path}/pkg/flags
-go test %{import_path}/pkg/ioutils
+go test %{import_path}/pkg/ioutil
go test %{import_path}/pkg/transport
go test %{import_path}/pkg/types
go test %{import_path}/pkg/wait
@@ -174,6 +174,11 @@ getent passwd %{name} /dev/null || useradd -r -g %{name}
-d %{_sharedstatedir}/
%{gopath}/src/%{import_path}
%changelog
+* Fri Jan 30 2015 jchaloup jchal...@redhat.com - 2.0.0-0.4
+- Update to etcd-2.0.0
+- use gopath as the last directory to search for source code
+ related: #1176138
+
* Mon Jan 26 2015 jchaloup jchal...@redhat.com - 2.0.0-0.3.rc1
- default to /var/lib/etcd/default.etcd as 2.0 uses that default (f21 commit
byt eparis)
related: #1176138
diff --git a/sources b/sources
index 316191f..c57d792 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b34a42260e32e32913d137cd60ec80ca v2.0.0-rc.1.tar.gz
+c9da6b748a6582763f4f9dcb89cec60e v2.0.0.tar.gz
___
golang mailing list
golang@lists.fedoraproject.org
https://lists.fedoraproject.org/mailman/listinfo/golang
[etcd/f20] Update configuration and service file - related: #1191441
commit 647c7367e1ef5d1dca67b5129a4fd1f83056b494
Author: Jan Chaloupka jchal...@redhat.com
Date: Wed Feb 18 15:40:23 2015 +0100
Update configuration and service file
- related: #1191441
...ricated-ErrWrongType-with-its-local-defin.patch | 693 +
etcd.conf | 68 +-
etcd.service | 2 +-
etcd.spec | 17 +-
4 files changed, 742 insertions(+), 38 deletions(-)
---
diff --git
a/etcd-2.0.1-Replace-depricated-ErrWrongType-with-its-local-defin.patch
b/etcd-2.0.1-Replace-depricated-ErrWrongType-with-its-local-defin.patch
new file mode 100644
index 000..275e6ae
--- /dev/null
+++ b/etcd-2.0.1-Replace-depricated-ErrWrongType-with-its-local-defin.patch
@@ -0,0 +1,693 @@
+From 62d30d1b956bbc7f4249e3b42c6f8b3e5db26789 Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka jchal...@redhat.com
+Date: Fri, 20 Feb 2015 11:04:20 +0100
+Subject: [PATCH] Replace depricated ErrWrongType with its local definition
+
+---
+ etcdserver/etcdserverpb/etcdserver.pb.go | 39 ++-
+ migrate/etcd4pb/log_entry.pb.go | 10 +++--
+ raft/raftpb/raft.pb.go | 64 ++--
+ snap/snappb/snap.pb.go | 6 ++-
+ wal/walpb/record.pb.go | 13 ---
+ 5 files changed, 75 insertions(+), 57 deletions(-)
+
+diff --git a/etcdserver/etcdserverpb/etcdserver.pb.go
b/etcdserver/etcdserverpb/etcdserver.pb.go
+index 2e8afc0..42eb0c2 100644
+--- a/etcdserver/etcdserverpb/etcdserver.pb.go
b/etcdserver/etcdserverpb/etcdserver.pb.go
+@@ -22,6 +22,7 @@ import math math
+
+ import io io
+ import code_google_com_p_gogoprotobuf_proto
code.google.com/p/gogoprotobuf/proto
++import errors errors
+
+ // Reference proto, json, and math imports to suppress error if they are not
otherwise used.
+ var _ = proto.Marshal
+@@ -67,6 +68,7 @@ func init() {
+ func (m *Request) Unmarshal(data []byte) error {
+ l := len(data)
+ index := 0
++ var ErrWrongType = errors.New(proto: field/encoding mismatch: wrong
type for field)
+ for index l {
+ var wire uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -85,7 +87,7 @@ func (m *Request) Unmarshal(data []byte) error {
+ switch fieldNum {
+ case 1:
+ if wireType != 0 {
+- return
code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ for shift := uint(0); ; shift += 7 {
+ if index = l {
+@@ -100,7 +102,7 @@ func (m *Request) Unmarshal(data []byte) error {
+ }
+ case 2:
+ if wireType != 2 {
+- return
code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -122,7 +124,7 @@ func (m *Request) Unmarshal(data []byte) error {
+ index = postIndex
+ case 3:
+ if wireType != 2 {
+- return
code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -144,7 +146,7 @@ func (m *Request) Unmarshal(data []byte) error {
+ index = postIndex
+ case 4:
+ if wireType != 2 {
+- return
code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -166,7 +168,7 @@ func (m *Request) Unmarshal(data []byte) error {
+ index = postIndex
+ case 5:
+ if wireType != 0 {
+- return
code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var v int
+ for shift := uint(0); ; shift += 7 {
+@@ -183,7 +185,7 @@ func (m *Request) Unmarshal(data []byte) error {
+ m.Dir = bool(v != 0)
+ case 6:
+ if wireType != 2 {
+- return
code_google_com_p_gogoprotobuf_proto.ErrWrongType
++ return ErrWrongType
+ }
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+@@ -205,7 +207,7 @@ func (m *Request)
[Bug 1191441] etcd-2.0.1 is available
https://bugzilla.redhat.com/show_bug.cgi?id=1191441 --- Comment #2 from Fedora Update System upda...@fedoraproject.org --- etcd-2.0.3-0.1.fc20 has been submitted as an update for Fedora 20. https://admin.fedoraproject.org/updates/etcd-2.0.3-0.1.fc20 -- 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 1191441] etcd-2.0.1 is available
https://bugzilla.redhat.com/show_bug.cgi?id=1191441 --- Comment #3 from Fedora Update System upda...@fedoraproject.org --- etcd-2.0.3-0.1.fc21 has been submitted as an update for Fedora 21. https://admin.fedoraproject.org/updates/etcd-2.0.3-0.1.fc21 -- 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
File spdystream-29e1da2.tar.gz uploaded to lookaside cache by jchaloup
A file has been added to the lookaside cache for golang-github-docker-spdystream: 1b966aef272bae67a01ec71c5629bbca spdystream-29e1da2.tar.gz ___ golang mailing list golang@lists.fedoraproject.org https://lists.fedoraproject.org/mailman/listinfo/golang
[golang-github-docker-spdystream/el6] First package for Fedora - resolves: #1196363
Summary of changes: 6aa2574... First package for Fedora - resolves: #1196363 (*) (*) This commit already existed in another branch; no separate mail sent ___ golang mailing list golang@lists.fedoraproject.org https://lists.fedoraproject.org/mailman/listinfo/golang
[golang-github-docker-spdystream/f22] First package for Fedora - resolves: #1196363
Summary of changes: 6aa2574... First package for Fedora - resolves: #1196363 (*) (*) This commit already existed in another branch; no separate mail sent ___ golang mailing list golang@lists.fedoraproject.org https://lists.fedoraproject.org/mailman/listinfo/golang
[golang-github-docker-spdystream] First package for Fedora - resolves: #1196363
Summary of changes: 6aa2574... First package for Fedora - resolves: #1196363 (*) (*) This commit already existed in another branch; no separate mail sent ___ golang mailing list golang@lists.fedoraproject.org https://lists.fedoraproject.org/mailman/listinfo/golang
[golang-github-docker-spdystream/f20] First package for Fedora - resolves: #1196363
commit 6aa2574a8e9e5e7e0c11bc29aed272cf9e5d1fe2
Author: Jan Chaloupka jchal...@redhat.com
Date: Fri Feb 27 00:31:00 2015 +0100
First package for Fedora
- resolves: #1196363
.gitignore | 1 +
golang-github-docker-spdystream.spec | 65
sources | 1 +
3 files changed, 67 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index e69de29..3aefba8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/spdystream-29e1da2.tar.gz
diff --git a/golang-github-docker-spdystream.spec
b/golang-github-docker-spdystream.spec
new file mode 100644
index 000..cd958c2
--- /dev/null
+++ b/golang-github-docker-spdystream.spec
@@ -0,0 +1,65 @@
+%global debug_package %{nil}
+%global providergithub
+%global provider_tldcom
+%global project docker
+%global repospdystream
+%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
+%global commit 29e1da2890f60336f98d0b3bf28b05070aa2ee4d
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
+Name: golang-%{provider}-%{project}-%{repo}
+Version:0
+Release:0.1.git%{shortcommit}%{?dist}
+Summary:A multiplexed stream library using spdy
+License:ASL 2.0
+URL:https://%{import_path}
+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
+%{summary}
+
+%package devel
+BuildRequires: golang = 1.2.1-3
+BuildRequires: golang(code.google.com/p/go.net/spdy)
+BuildRequires: golang(github.com/gorilla/websocket)
+Requires: golang = 1.2.1-3
+Requires: golang(code.google.com/p/go.net/spdy)
+Requires: golang(github.com/gorilla/websocket)
+Summary:%{summary}
+Provides: golang(%{import_path}) = %{version}-%{release}
+Provides: golang(%{import_path}/ws) = %{version}-%{release}
+
+%description devel
+%{summary}
+
+This package contains library source intended for
+building other packages which use %{project}/%{repo}.
+
+%prep
+%setup -q -n %{repo}-%{commit}
+
+%build
+
+%install
+install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
+cp -pav *.go %{buildroot}/%{gopath}/src/%{import_path}/
+cp -rpav ws %{buildroot}/%{gopath}/src/%{import_path}/
+
+%check
+GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}
+#GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/ws
+
+%files devel
+%doc CONTRIBUTING.md README.md LICENSE
+%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
+%{gopath}/src/%{import_path}
+
+%changelog
+* Wed Feb 25 2015 jchaloup jchal...@redhat.com - 0-0.1.git29e1da2
+- First package for Fedora
+ resolves: #1196363
diff --git a/sources b/sources
index e69de29..dba87d5 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+1b966aef272bae67a01ec71c5629bbca spdystream-29e1da2.tar.gz
___
golang mailing list
golang@lists.fedoraproject.org
https://lists.fedoraproject.org/mailman/listinfo/golang
[golang-github-docker-spdystream/f21] First package for Fedora - resolves: #1196363
Summary of changes: 6aa2574... First package for Fedora - resolves: #1196363 (*) (*) This commit already existed in another branch; no separate mail sent ___ golang mailing list golang@lists.fedoraproject.org https://lists.fedoraproject.org/mailman/listinfo/golang
[docker-io] NVR: docker-io-1.5.0-13.gitf5850e8
commit da2579e22488d38f4bf1e087adda3c429651445d
Author: Lokesh Mandvekar l...@fedoraproject.org
Date: Thu Feb 26 22:12:53 2015 -0600
NVR: docker-io-1.5.0-13.gitf5850e8
Signed-off-by: Lokesh Mandvekar l...@fedoraproject.org
docker-io.spec | 7 +--
sources| 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 8808f0d..11816e0 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -11,14 +11,14 @@
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit 7e2328b76e041bb7a1acb3e20dbea0c379f7f024
+%global commit f5850e8e30b9420d26bd12136d8bbb6669d1e2bb
%global shortcommit %(c=%{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: 12.git%{shortcommit}%{?dist}
+Release: 13.git%{shortcommit}%{?dist}
Summary:Automates deployment of containerized applications
License:ASL 2.0
URL:http://www.docker.com
@@ -362,6 +362,9 @@ exit 0
%{_datadir}/zsh/site-functions/_docker
%changelog
+* Fri Feb 27 2015 Lokesh Mandvekar l...@fedoraproject.org -
1.5.0-13.gitf5850e8
+- built commit#f5850e8
+
* Thu Feb 26 2015 Lokesh Mandvekar l...@fedoraproject.org -
1.5.0-12.git7e2328b
- built commit#7e2328b
diff --git a/sources b/sources
index 8737548..8572ef6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5462a34be256113d9d20e17094a44030 docker-7e2328b.tar.gz
+ff23fde787a232911f6b09f88e59b19b docker-f5850e8.tar.gz
___
golang mailing list
golang@lists.fedoraproject.org
https://lists.fedoraproject.org/mailman/listinfo/golang
[docker-io] Resolves: rhbz#1195328
commit aaf5d1b8eec6bcb2c34bb6d5faa2162feaa8e660
Author: Lokesh Mandvekar l...@fedoraproject.org
Date: Mon Feb 23 13:17:45 2015 -0600
Resolves: rhbz#1195328
- buildable again
- dockerversion not exported anymore
Signed-off-by: Lokesh Mandvekar l...@fedoraproject.org
docker-io.spec | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 6122a41..beea506 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -18,7 +18,7 @@
Name: %{repo}-io
Version: 1.5.0
-Release: 9.git%{shortcommit}%{?dist}
+Release: 10.git%{shortcommit}%{?dist}
Summary:Automates deployment of containerized applications
License:ASL 2.0
URL:http://www.docker.com
@@ -30,6 +30,7 @@ Source3:%{repo}-storage.sysconfig
Source4:%{repo}-logrotate.sh
Source5:README.%{repo}-logrotate
Source6:%{repo}-network.sysconfig
+Patch0: add-X-flag.patch
BuildRequires: glibc-static
BuildRequires: golang = 1.3.3
BuildRequires: go-md2man
@@ -76,7 +77,6 @@ Provides: golang(%{import_path}/builder/parser) =
%{version}-%{release}
Provides: golang(%{import_path}/builder/parser/dumper) = %{version}-%{release}
Provides: golang(%{import_path}/builder/command) = %{version}-%{release}
Provides: golang(%{import_path}/nat) = %{version}-%{release}
-Provides: golang(%{import_path}/dockerversion) = %{version}-%{release}
Provides: golang(%{import_path}/utils) = %{version}-%{release}
Provides: golang(%{import_path}/integration-cli) = %{version}-%{release}
Provides: golang(%{import_path}/trust) = %{version}-%{release}
@@ -205,6 +205,7 @@ This package installs %{summary}.
%prep
%setup -qn %{repo}-%{commit}
cp %{SOURCE5} .
+%patch0 -p1
%build
# set up temporary build gopath, and put our directory there
@@ -282,7 +283,7 @@ rm -rf pkg/symlink/testdata
for dir in api builder builtins contrib/docker-device-tool \
contrib/host-integration daemon docker dockerinit \
-dockerversion engine events graph \
+engine events graph \
image links nat opts pkg registry runconfig \
trust utils volumes
do
@@ -357,6 +358,10 @@ exit 0
%{_datadir}/zsh/site-functions/_docker
%changelog
+* Mon Feb 23 2015 Lokesh Mandvekar l...@fedoraproject.org -
1.5.0-10.git09b785f
+- Resolves: rhbz#1195328 - solve build failures by adding -X flag back
+also see (https://github.com/docker/docker/issues/9207#issuecomment-75578730)
+
* Wed Feb 18 2015 Lokesh Mandvekar l...@fedoraproject.org -
1.5.0-9.git09b785f
- built commit#09b785f
___
golang mailing list
golang@lists.fedoraproject.org
https://lists.fedoraproject.org/mailman/listinfo/golang
[docker-io] Remove hardcoded install paths for devel
commit 3269313853dbf3eaf32ebf3e6c36d20c1ce2db0c
Author: Lokesh Mandvekar l...@fedoraproject.org
Date: Thu Feb 26 01:06:50 2015 -0600
Remove hardcoded install paths for devel
- add version-release to devel package
Provides, also Provide: tar_import_path
- use wildcard to install all source files in -devel
Signed-off-by: Lokesh Mandvekar l...@fedoraproject.org
docker-io.spec | 25 +
1 file changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 55f9ddc..f477efb 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -71,9 +71,10 @@ servers, OpenStack clusters, public instances, or
combinations of the above.
%package devel
BuildRequires: golang = 1.2.1-3
Requires: golang = 1.2.1-3
-Provides: %{repo}-devel
-Provides: %{name}-pkg-devel
-Provides: %{repo}-pkg-devel
+Provides: %{repo}-devel = %{version}-%{release}
+Provides: %{name}-pkg-devel = %{version}-%{release}
+Provides: %{repo}-pkg-devel = %{version}-%{release}
+Provides: golang(%{import_path}/vendor/src/%{tar_import_path}) =
%{version}-%{release}
Summary: A golang registry for global request variables (source libraries)
Provides: golang(%{import_path}) = %{version}-%{release}
Provides: golang(%{import_path}/builder) = %{version}-%{release}
@@ -284,18 +285,18 @@ install -p -m 644 %{SOURCE3}
%{buildroot}%{_sysconfdir}/sysconfig/docker-storage
install -d -p %{buildroot}%{gopath}/src/%{import_path}
rm -rf pkg/symlink/testdata
-for dir in api builder builtins contrib/docker-device-tool \
-contrib/host-integration daemon docker dockerinit \
-engine events graph \
-image links nat opts pkg registry runconfig \
-trust utils volumes
-do
-cp -rpav $dir %{buildroot}%{gopath}/src/%{import_path}/
-done
-
+# install tar_import_path to devel package
install -d -p
%{buildroot}%{gopath}/src/%{import_path}/vendor/src/%{tar_import_path}
cp -rpav vendor/src/%{tar_import_path}/*
%{buildroot}%{gopath}/src/%{import_path}/vendor/src/%{tar_import_path}
+# remove dirs that won't be installed in devel
+rm -rf vendor docs _build bundles contrib/init hack project
+
+# install sources to devel
+for dir in */ ; do
+cp -rpav $dir %{buildroot}/%{gopath}/src/%{import_path}/
+done
+
# install docker config directory
install -dp %{buildroot}%{_sysconfdir}/%{repo}
___
golang mailing list
golang@lists.fedoraproject.org
https://lists.fedoraproject.org/mailman/listinfo/golang
File docker-f5850e8.tar.gz uploaded to lookaside cache by lsm5
A file has been added to the lookaside cache for docker-io: ff23fde787a232911f6b09f88e59b19b docker-f5850e8.tar.gz ___ golang mailing list golang@lists.fedoraproject.org https://lists.fedoraproject.org/mailman/listinfo/golang
[docker-io] remove add-X-flag.patch
commit 1a8e7fff1d31bc5d7c7c13ae184ade1dc74aff2d
Author: Lokesh Mandvekar l...@fedoraproject.org
Date: Wed Feb 25 22:59:08 2015 -0600
remove add-X-flag.patch
Signed-off-by: Lokesh Mandvekar l...@fedoraproject.org
docker-io.spec | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index beea506..ad14ffd 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -18,7 +18,7 @@
Name: %{repo}-io
Version: 1.5.0
-Release: 10.git%{shortcommit}%{?dist}
+Release: 11.git%{shortcommit}%{?dist}
Summary:Automates deployment of containerized applications
License:ASL 2.0
URL:http://www.docker.com
@@ -30,7 +30,6 @@ Source3:%{repo}-storage.sysconfig
Source4:%{repo}-logrotate.sh
Source5:README.%{repo}-logrotate
Source6:%{repo}-network.sysconfig
-Patch0: add-X-flag.patch
BuildRequires: glibc-static
BuildRequires: golang = 1.3.3
BuildRequires: go-md2man
@@ -205,7 +204,6 @@ This package installs %{summary}.
%prep
%setup -qn %{repo}-%{commit}
cp %{SOURCE5} .
-%patch0 -p1
%build
# set up temporary build gopath, and put our directory there
@@ -358,6 +356,9 @@ exit 0
%{_datadir}/zsh/site-functions/_docker
%changelog
+* Wed Feb 25 2015 Lokesh Mandvekar l...@fedoraproject.org -
1.5.0-11.git09b785f
+- remove add-X-flag.patch
+
* Mon Feb 23 2015 Lokesh Mandvekar l...@fedoraproject.org -
1.5.0-10.git09b785f
- Resolves: rhbz#1195328 - solve build failures by adding -X flag back
also see (https://github.com/docker/docker/issues/9207#issuecomment-75578730)
___
golang mailing list
golang@lists.fedoraproject.org
https://lists.fedoraproject.org/mailman/listinfo/golang
[docker-io] NVR: docker-io-1.5.0-12.git7e2328b
commit a5229fd9f7c2975a43a20dd011f1ef895a481771
Author: Lokesh Mandvekar l...@fedoraproject.org
Date: Thu Feb 26 02:41:54 2015 -0600
NVR: docker-io-1.5.0-12.git7e2328b
Signed-off-by: Lokesh Mandvekar l...@fedoraproject.org
docker-io.spec | 7 +--
sources| 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index f477efb..8808f0d 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -11,14 +11,14 @@
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit 09b785f3bed812736fe7526535088ca73c1fa10d
+%global commit 7e2328b76e041bb7a1acb3e20dbea0c379f7f024
%global shortcommit %(c=%{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: 11.git%{shortcommit}%{?dist}
+Release: 12.git%{shortcommit}%{?dist}
Summary:Automates deployment of containerized applications
License:ASL 2.0
URL:http://www.docker.com
@@ -362,6 +362,9 @@ exit 0
%{_datadir}/zsh/site-functions/_docker
%changelog
+* Thu Feb 26 2015 Lokesh Mandvekar l...@fedoraproject.org -
1.5.0-12.git7e2328b
+- built commit#7e2328b
+
* Wed Feb 25 2015 Lokesh Mandvekar l...@fedoraproject.org -
1.5.0-11.git09b785f
- remove add-X-flag.patch
- require selinux-policy = 3.13.1-114 for fedora = 23 (RE: rhbz#1195804)
diff --git a/sources b/sources
index 03903fd..8737548 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-64c62ea46cc1ab76479013357d1cf640 docker-09b785f.tar.gz
+5462a34be256113d9d20e17094a44030 docker-7e2328b.tar.gz
___
golang mailing list
golang@lists.fedoraproject.org
https://lists.fedoraproject.org/mailman/listinfo/golang
[docker-io] ensure min NVR policy RE: rhbz#1195804
commit 86ee58aa501f7a57f5c42e34b258cb7356504f9e
Author: Lokesh Mandvekar l...@fedoraproject.org
Date: Wed Feb 25 23:43:37 2015 -0600
ensure min NVR policy RE: rhbz#1195804
Signed-off-by: Lokesh Mandvekar l...@fedoraproject.org
docker-io.spec | 6 ++
1 file changed, 6 insertions(+)
---
diff --git a/docker-io.spec b/docker-io.spec
index ad14ffd..55f9ddc 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -42,6 +42,11 @@ BuildRequires: pkgconfig(systemd)
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
+%endif
+
# Resolves: rhbz#1045220
Requires: xz
Provides: lxc-docker = %{version}-%{release}
@@ -358,6 +363,7 @@ exit 0
%changelog
* Wed Feb 25 2015 Lokesh Mandvekar l...@fedoraproject.org -
1.5.0-11.git09b785f
- remove add-X-flag.patch
+- require selinux-policy = 3.13.1-114 for fedora = 23 (RE: rhbz#1195804)
* Mon Feb 23 2015 Lokesh Mandvekar l...@fedoraproject.org -
1.5.0-10.git09b785f
- Resolves: rhbz#1195328 - solve build failures by adding -X flag back
___
golang mailing list
golang@lists.fedoraproject.org
https://lists.fedoraproject.org/mailman/listinfo/golang
