Rebuild for golang 1.25.2

This reverts commit df31b2130d.

.gitignore

@@ -1,2 +1,20 @@
 /etcd-3.2.16.tar.gz
 /man-3.2.16.tar.gz
+/etcd-e1ca3b4434945e57e8e3a451cdbde74a903cc8e1.tar.gz
+/man-3.3.12.tar.gz
+/etcd-f29b1ada19713544b698dab8c94c97cfa1e83dac.tar.gz
+/etcd-cca0d5c1bed134ac30e1354241f7655d2a118db4.tar.gz
+/etcd-3.3.13.tar.gz
+/man-3.3.13.tar.gz
+/etcd-3.4.3.tar.gz
+/man-3.4.3.tar.gz
+/etcd-3.4.7.tar.gz
+/man-3.4.7.tar.gz
+/etcd-3.4.13.tar.gz
+/man-3.4.13.tar.gz
+/etcd-3.4.14.tar.gz
+/man-3.4.14.tar.gz
+/etcd-3.5.0.tar.gz
+/etcd-3.5.5.tar.gz
+/etcd-3.5.11.tar.gz
+/etcd-3.5.13.tar.gz

0001-hack-etcdmain-to-generate-etcd.1.patch

@@ -1,263 +0,0 @@
-From 81519130b0abec199ddc9e3559e64884742b1bf5 Mon Sep 17 00:00:00 2001
-From: Jan Chaloupka <jchaloup@redhat.com>
-Date: Tue, 7 Nov 2017 14:04:01 +0100
-Subject: [PATCH] hack etcdmain to generate etcd.1
-
----
- etcdmain/config.go       |  25 ++++----
- etcdmain/fake_flagset.go | 157 +++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 171 insertions(+), 11 deletions(-)
- create mode 100644 etcdmain/fake_flagset.go
-
-diff --git a/etcdmain/config.go b/etcdmain/config.go
-index b873220..4770334 100644
---- a/etcdmain/config.go
-+++ b/etcdmain/config.go
-@@ -118,14 +118,14 @@ func newConfig() *config {
- 		),
- 	}
- 
--	fs := cfg.FlagSet
--	fs.Usage = func() {
-+	fs := InitFlagSet(cfg.FlagSet)
-+	cfg.FlagSet.Usage = func() {
- 		fmt.Fprintln(os.Stderr, usageline)
- 	}
- 
- 	fs.StringVar(&cfg.configFile, "config-file", "", "Path to the server configuration file")
- 
--	// member
-+	fs.AddGroup("member")
- 	fs.Var(cfg.CorsInfo, "cors", "Comma-separated white list of origins for CORS (cross-origin resource sharing).")
- 	fs.StringVar(&cfg.Dir, "data-dir", cfg.Dir, "Path to the data directory.")
- 	fs.StringVar(&cfg.WalDir, "wal-dir", cfg.WalDir, "Path to the dedicated wal directory.")
-@@ -139,7 +139,7 @@ func newConfig() *config {
- 	fs.UintVar(&cfg.ElectionMs, "election-timeout", cfg.ElectionMs, "Time (in milliseconds) for an election to timeout.")
- 	fs.Int64Var(&cfg.QuotaBackendBytes, "quota-backend-bytes", cfg.QuotaBackendBytes, "Raise alarms when backend size exceeds the given quota. 0 means use the default quota.")
- 
--	// clustering
-+	fs.AddGroup("clustering")
- 	fs.Var(flags.NewURLsValue(embed.DefaultInitialAdvertisePeerURLs), "initial-advertise-peer-urls", "List of this member's peer URLs to advertise to the rest of the cluster.")
- 	fs.Var(flags.NewURLsValue(embed.DefaultAdvertiseClientURLs), "advertise-client-urls", "List of this member's client URLs to advertise to the public.")
- 	fs.StringVar(&cfg.Durl, "discovery", cfg.Durl, "Discovery URL used to bootstrap the cluster.")
-@@ -160,7 +160,7 @@ func newConfig() *config {
- 	fs.BoolVar(&cfg.StrictReconfigCheck, "strict-reconfig-check", cfg.StrictReconfigCheck, "Reject reconfiguration requests that would cause quorum loss.")
- 	fs.BoolVar(&cfg.EnableV2, "enable-v2", true, "Accept etcd V2 client requests.")
- 
--	// proxy
-+	fs.AddGroup("proxy")
- 	fs.Var(cfg.proxy, "proxy", fmt.Sprintf("Valid values include %s", strings.Join(cfg.proxy.Values, ", ")))
- 	if err := cfg.proxy.Set(proxyFlagOff); err != nil {
- 		// Should never happen.
-@@ -172,7 +172,7 @@ func newConfig() *config {
- 	fs.UintVar(&cfg.ProxyWriteTimeoutMs, "proxy-write-timeout", cfg.ProxyWriteTimeoutMs, "Time (in milliseconds) for a write to timeout.")
- 	fs.UintVar(&cfg.ProxyReadTimeoutMs, "proxy-read-timeout", cfg.ProxyReadTimeoutMs, "Time (in milliseconds) for a read to timeout.")
- 
--	// security
-+	fs.AddGroup("security")
- 	fs.StringVar(&cfg.ClientTLSInfo.CAFile, "ca-file", "", "DEPRECATED: Path to the client server TLS CA file.")
- 	fs.StringVar(&cfg.ClientTLSInfo.CertFile, "cert-file", "", "Path to the client server TLS cert file.")
- 	fs.StringVar(&cfg.ClientTLSInfo.KeyFile, "key-file", "", "Path to the client server TLS key file.")
-@@ -186,28 +186,31 @@ func newConfig() *config {
- 	fs.StringVar(&cfg.PeerTLSInfo.TrustedCAFile, "peer-trusted-ca-file", "", "Path to the peer server TLS trusted CA file.")
- 	fs.BoolVar(&cfg.PeerAutoTLS, "peer-auto-tls", false, "Peer TLS using generated certificates")
- 
--	// logging
-+	fs.AddGroup("logging")
- 	fs.BoolVar(&cfg.Debug, "debug", false, "Enable debug-level logging for etcd.")
- 	fs.StringVar(&cfg.LogPkgLevels, "log-package-levels", "", "Specify a particular log level for each etcd package (eg: 'etcdmain=CRITICAL,etcdserver=DEBUG').")
- 	fs.StringVar(&cfg.logOutput, "log-output", "default", "Specify 'stdout' or 'stderr' to skip journald logging even when running under systemd.")
- 
--	// unsafe
-+	fs.AddGroup("unsafe")
- 	fs.BoolVar(&cfg.ForceNewCluster, "force-new-cluster", false, "Force to create a new one member cluster.")
- 
--	// version
-+	fs.AddGroup("version")
- 	fs.BoolVar(&cfg.printVersion, "version", false, "Print the version and exit.")
- 
- 	fs.IntVar(&cfg.AutoCompactionRetention, "auto-compaction-retention", 0, "Auto compaction retention for mvcc key value store in hour. 0 means disable auto compaction.")
- 
--	// pprof profiler via HTTP
-+	fs.AddGroup("profiling")
- 	fs.BoolVar(&cfg.EnablePprof, "enable-pprof", false, "Enable runtime profiling data via HTTP server. Address is at client URL + \"/debug/pprof/\"")
- 
- 	// additional metrics
- 	fs.StringVar(&cfg.Metrics, "metrics", cfg.Metrics, "Set level of detail for exported metrics, specify 'extensive' to include histogram metrics")
- 
--	// auth
-+	fs.AddGroup("auth")
- 	fs.StringVar(&cfg.AuthToken, "auth-token", cfg.AuthToken, "Specify auth token specific options.")
- 
-+	fs.GenMan()
-+	os.Exit(0)
-+
- 	// ignored
- 	for _, f := range cfg.ignored {
- 		fs.Var(&flags.IgnoredFlag{Name: f}, f, "")
-diff --git a/etcdmain/fake_flagset.go b/etcdmain/fake_flagset.go
-new file mode 100644
-index 0000000..71f230b
---- /dev/null
-+++ b/etcdmain/fake_flagset.go
-@@ -0,0 +1,157 @@
-+package etcdmain
-+
-+import (
-+	"flag"
-+	"fmt"
-+	"strconv"
-+	"strings"
-+	"time"
-+)
-+
-+type flagInfo struct {
-+	value fmt.Stringer
-+	name  string
-+	usage string
-+}
-+
-+type stringValue string
-+
-+func (s *stringValue) String() string { return string(*s) }
-+
-+type uintValue uint
-+
-+func (i *uintValue) String() string { return strconv.FormatUint(uint64(*i), 10) }
-+
-+type uint64Value uint64
-+
-+func (i *uint64Value) String() string { return strconv.FormatUint(uint64(*i), 10) }
-+
-+type int64Value int64
-+
-+func (i *int64Value) String() string { return strconv.FormatInt(int64(*i), 10) }
-+
-+type durationValue time.Duration
-+
-+func (d *durationValue) String() string { return (*time.Duration)(d).String() }
-+
-+type boolValue bool
-+
-+func (b *boolValue) String() string { return strconv.FormatBool(bool(*b)) }
-+
-+type FakeFlagSet struct {
-+	fs        *flag.FlagSet
-+	flags     map[string][]flagInfo
-+	groups    []string
-+	lastGroup string
-+}
-+
-+func InitFlagSet(fs *flag.FlagSet) *FakeFlagSet {
-+	return &FakeFlagSet{
-+		fs:    fs,
-+		flags: make(map[string][]flagInfo),
-+	}
-+}
-+
-+func (fs *FakeFlagSet) AddGroup(name string) {
-+	fs.flags[name] = nil
-+	fs.groups = append(fs.groups, name)
-+	fs.lastGroup = name
-+}
-+
-+func (fs *FakeFlagSet) Var(value flag.Value, name string, usage string) {
-+	fs.flags[fs.lastGroup] = append(fs.flags[fs.lastGroup], flagInfo{
-+		value: value,
-+		name:  name,
-+		usage: usage,
-+	})
-+	fs.fs.Var(value, name, usage)
-+}
-+
-+func (fs *FakeFlagSet) StringVar(p *string, name string, value string, usage string) {
-+	fs.flags[fs.lastGroup] = append(fs.flags[fs.lastGroup], flagInfo{
-+		value: (*stringValue)(&value),
-+		name:  name,
-+		usage: usage,
-+	})
-+	fs.fs.StringVar(p, name, value, usage)
-+}
-+
-+// -- int Value
-+type intValue int
-+
-+func (i *intValue) String() string { return strconv.Itoa(int(*i)) }
-+
-+func (fs *FakeFlagSet) UintVar(p *uint, name string, value uint, usage string) {
-+	fs.flags[fs.lastGroup] = append(fs.flags[fs.lastGroup], flagInfo{
-+		value: (*uintValue)(&value),
-+		name:  name,
-+		usage: usage,
-+	})
-+	fs.fs.UintVar(p, name, value, usage)
-+}
-+
-+func (fs *FakeFlagSet) Uint64Var(p *uint64, name string, value uint64, usage string) {
-+	fs.flags[fs.lastGroup] = append(fs.flags[fs.lastGroup], flagInfo{
-+		value: (*uint64Value)(&value),
-+		name:  name,
-+		usage: usage,
-+	})
-+	fs.fs.Uint64Var(p, name, value, usage)
-+}
-+
-+func (fs *FakeFlagSet) IntVar(p *int, name string, value int, usage string) {
-+	fs.flags[fs.lastGroup] = append(fs.flags[fs.lastGroup], flagInfo{
-+		value: (*intValue)(&value),
-+		name:  name,
-+		usage: usage,
-+	})
-+	fs.fs.IntVar(p, name, value, usage)
-+}
-+
-+func (fs *FakeFlagSet) Int64Var(p *int64, name string, value int64, usage string) {
-+	fs.flags[fs.lastGroup] = append(fs.flags[fs.lastGroup], flagInfo{
-+		value: (*int64Value)(&value),
-+		name:  name,
-+		usage: usage,
-+	})
-+	fs.fs.Int64Var(p, name, value, usage)
-+}
-+
-+func (fs *FakeFlagSet) DurationVar(p *time.Duration, name string, value time.Duration, usage string) {
-+	fs.flags[fs.lastGroup] = append(fs.flags[fs.lastGroup], flagInfo{
-+		value: (*durationValue)(&value),
-+		name:  name,
-+		usage: usage,
-+	})
-+	fs.fs.DurationVar(p, name, value, usage)
-+}
-+
-+func (fs *FakeFlagSet) BoolVar(p *bool, name string, value bool, usage string) {
-+	fs.flags[fs.lastGroup] = append(fs.flags[fs.lastGroup], flagInfo{
-+		value: (*boolValue)(&value),
-+		name:  name,
-+		usage: usage,
-+	})
-+	fs.fs.BoolVar(p, name, value, usage)
-+}
-+
-+func (fs *FakeFlagSet) GenMan() {
-+	fmt.Printf(".TH \"ETCD\" \"1\" \" etcd User Manuals\" \"Etcd contributors\" \"Nov 2017\"  \"\"\n")
-+	fmt.Printf(".SH NAME:\netcd - Distributed reliable key-value store for the most critical data of a distributed system\n\n")
-+	fmt.Printf(".SH USAGE:\netcd [flags]\n\n")
-+	fmt.Printf(".SH DESCRIPTION:\nEtcd is a distributed key-value store designed to reliably and quickly preserve and provide access to critical data. It enables reliable distributed coordination through distributed locking, leader elections, and write barriers. An etcd cluster is intended for high availability and permanent data storage and retrieval.\n\n")
-+	fmt.Printf(".SH GENERAL OPTIONS\n\n")
-+	for _, group := range fs.groups {
-+		fmt.Printf(".I %v flags\n\n", strings.Title(group))
-+		for _, flag := range fs.flags[group] {
-+			var flagstr string
-+			if len(flag.name) == 1 {
-+				flagstr = "-" + flag.name
-+			} else {
-+				flagstr = "--" + flag.name
-+			}
-+			fmt.Printf(".RS\n\\fB%v %v\\fP\n      %v\n\n.RE\n", flagstr, flag.value.String(), flag.usage)
-+		}
-+	}
-+	fmt.Printf(".SH SEE ALSO:\n\\fBetcdctl(1)\\fP, \\fBetcdctl2(1)\\fP, \\fBetcdctl3(1)\\fP\n\n")
-+}
--- 
-2.7.5
-

0001-hack-to-generate-man-pages.patch

@@ -1,137 +0,0 @@
-From 481e731c01426bd7488011352515db03a46aa280 Mon Sep 17 00:00:00 2001
-From: Jan Chaloupka <jchaloup@redhat.com>
-Date: Mon, 6 Nov 2017 23:05:19 +0100
-Subject: [PATCH] hack-to-generate-man-pages
-
----
- .../_workspace/src/github.com/urfave/cli/flag.go   |  4 +-
- etcdctl/ctlv2/ctl.go                               | 62 ++++++++++++++++++++++
- etcdctl/ctlv3/ctl_nocov.go                         | 13 +++--
- 3 files changed, 74 insertions(+), 5 deletions(-)
-
-diff --git a/Godeps/_workspace/src/github.com/urfave/cli/flag.go b/Godeps/_workspace/src/github.com/urfave/cli/flag.go
-index f8a28d1..9787fe1 100644
---- a/Godeps/_workspace/src/github.com/urfave/cli/flag.go
-+++ b/Godeps/_workspace/src/github.com/urfave/cli/flag.go
-@@ -752,7 +752,7 @@ func prefixedNames(fullName, placeholder string) string {
- 	parts := strings.Split(fullName, ",")
- 	for i, name := range parts {
- 		name = strings.Trim(name, " ")
--		prefixed += prefixFor(name) + name
-+		prefixed += "\\fB" + prefixFor(name) + name + "\\fP"
- 		if placeholder != "" {
- 			prefixed += " " + placeholder
- 		}
-@@ -828,7 +828,7 @@ func stringifyFlag(f Flag) string {
- 	usageWithDefault := strings.TrimSpace(fmt.Sprintf("%s%s", usage, defaultValueString))
- 
- 	return withEnvHint(fv.FieldByName("EnvVar").String(),
--		fmt.Sprintf("%s\t%s", prefixedNames(fv.FieldByName("Name").String(), placeholder), usageWithDefault))
-+		fmt.Sprintf("%s\n\t\t\t%s", prefixedNames(fv.FieldByName("Name").String(), placeholder), usageWithDefault))
- }
- 
- func stringifyIntSliceFlag(f IntSliceFlag) string {
-diff --git a/etcdctl/ctlv2/ctl.go b/etcdctl/ctlv2/ctl.go
-index e949b06..eb5170a 100644
---- a/etcdctl/ctlv2/ctl.go
-+++ b/etcdctl/ctlv2/ctl.go
-@@ -42,6 +42,68 @@ func Start(apiv string) {
- 			"   Set environment variable ETCDCTL_API=3 to use v3 API or ETCDCTL_API=2 to use v2 API."
- 	}
- 
-+	cli.AppHelpTemplate = `.TH "ETCD" "1" " etcd User Manuals" "Etcd contributors" "Nov 2017"  ""
-+.SH NAME:
-+{{.Name}} - {{.Usage}}
-+
-+{{if .Version}}
-+.SH VERSION:
-+   {{.Version}}
-+{{end}}
-+
-+.SH USAGE:
-+   {{.HelpName}} {{if .VisibleFlags}}[global options]{{end}}{{if .Commands}} command [command options]{{end}} {{if .ArgsUsage}}{{.ArgsUsage}}{{else}}[arguments...]{{end}}
-+   {{if .Commands}}
-+
-+.SH COMMANDS:
-+{{range .Commands}}{{if not .HideHelp}}\fB{{ .Name }}\fP{{ "\n\t\t\t" }}{{.Usage}}{{ "\n" }}
-+
-+{{end}}{{end}}{{end}}{{if .VisibleFlags}}
-+
-+.SH GLOBAL OPTIONS:
-+{{range .VisibleFlags}}{{ . }}
-+
-+{{end}}{{end}}
-+
-+.SH SEE ALSO
-+{{range .Commands}}{{if not .HideHelp}}{{if ne .Name "help" }}\fBetcdctl-{{ .Name }}(1)\fP,
-+{{end}}{{end}}{{end}}
-+`
-+
-+	cli.CommandHelpTemplate = `.TH "ETCD" "1" " etcd User Manuals" "Etcd contributors" "Nov 2017"  ""
-+.SH NAME:
-+   {{.HelpName}} - {{.Usage}}
-+
-+.SH USAGE:
-+   {{.HelpName}}{{if .VisibleFlags}} [command options]{{end}} {{if .ArgsUsage}}{{.ArgsUsage}}{{else}}[arguments...]{{end}}
-+
-+{{if .VisibleFlags}}
-+.SH OPTIONS:
-+   {{range .VisibleFlags}}{{.}}
-+   {{end}}{{end}}
-+`
-+
-+
-+	cli.SubcommandHelpTemplate = `.TH "ETCD" "1" " etcd User Manuals" "Etcd contributors" "Nov 2017"  ""
-+.SH NAME:
-+   {{.HelpName}} - {{.Usage}}
-+
-+.SH USAGE:
-+   {{.HelpName}} command{{if .VisibleFlags}} [command options]{{end}} {{if .ArgsUsage}}{{.ArgsUsage}}{{else}}[arguments...]{{end}}
-+
-+.SH COMMANDS:
-+{{range .VisibleCategories}}{{if .Name}}
-+{{.Name}}:{{end}}{{range .VisibleCommands}}
-+\fB{{ .Name }}\fP{{"\n\t\t\t"}}{{.Usage}}{{ "\n" }}{{end}}
-+{{end}}
-+
-+{{if .VisibleFlags}}
-+.SH OPTIONS:
-+{{range .VisibleFlags}}{{.}}
-+{{end}}{{end}}
-+`
-+
-+
- 	app.Flags = []cli.Flag{
- 		cli.BoolFlag{Name: "debug", Usage: "output cURL commands which can be used to reproduce the request"},
- 		cli.BoolFlag{Name: "no-sync", Usage: "don't synchronize cluster information before sending request"},
-diff --git a/etcdctl/ctlv3/ctl_nocov.go b/etcdctl/ctlv3/ctl_nocov.go
-index 52751fe..e3089cf 100644
---- a/etcdctl/ctlv3/ctl_nocov.go
-+++ b/etcdctl/ctlv3/ctl_nocov.go
-@@ -16,13 +16,20 @@
- 
- package ctlv3
- 
--import "github.com/coreos/etcd/etcdctl/ctlv3/command"
-+//import "github.com/coreos/etcd/etcdctl/ctlv3/command"
-+import "github.com/spf13/cobra"
- 
- func Start() {
- 	rootCmd.SetUsageFunc(usageFunc)
- 	// Make help just show the usage
- 	rootCmd.SetHelpTemplate(`{{.UsageString}}`)
--	if err := rootCmd.Execute(); err != nil {
--		command.ExitWithError(command.ExitError, err)
-+	//if err := rootCmd.Execute(); err != nil {
-+	//	command.ExitWithError(command.ExitError, err)
-+	//}
-+	header := &cobra.GenManHeader{
-+		Title: "etcdctl3",
-+		Section: "1",
- 	}
-+
-+	cobra.GenManTree(rootCmd, header, "")
- }
--- 
-2.7.5
-

1136ba0e0d4ab628cb13ffd76da47dbea357d0a6.patch

@@ -1,23 +0,0 @@
-From 1136ba0e0d4ab628cb13ffd76da47dbea357d0a6 Mon Sep 17 00:00:00 2001
-From: Gyuho Lee <gyuhox@gmail.com>
-Date: Fri, 15 Jun 2018 10:36:17 -0700
-Subject: [PATCH] raft: fix logger variadic parameter
-
-Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
----
- raft/logger.go | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/raft/logger.go b/raft/logger.go
-index 92e55b373e..426a77d344 100644
---- a/raft/logger.go
-+++ b/raft/logger.go
-@@ -114,7 +114,7 @@ func (l *DefaultLogger) Fatalf(format string, v ...interface{}) {
- }
- 
- func (l *DefaultLogger) Panic(v ...interface{}) {
--	l.Logger.Panic(v)
-+	l.Logger.Panic(v...)
- }
- 
- func (l *DefaultLogger) Panicf(format string, v ...interface{}) {

Fix-format-errors.patch

@@ -1,34 +0,0 @@
-From 89901423d929b66240231196616688cddb39b115 Mon Sep 17 00:00:00 2001
-From: Jan Chaloupka <jchaloup@redhat.com>
-Date: Fri, 9 Mar 2018 17:13:26 +0100
-Subject: [PATCH] Fix format errors
-
----
- pkg/pbutil/pbutil_test.go | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pkg/pbutil/pbutil_test.go b/pkg/pbutil/pbutil_test.go
-index fd361ec..21b1870 100644
---- a/pkg/pbutil/pbutil_test.go
-+++ b/pkg/pbutil/pbutil_test.go
-@@ -24,7 +24,7 @@ func TestMarshaler(t *testing.T) {
- 	data := []byte("test data")
- 	m := &fakeMarshaler{data: data}
- 	if g := MustMarshal(m); !reflect.DeepEqual(g, data) {
--		t.Errorf("data = %s, want %s", g, m)
-+		t.Errorf("data = %s, want #%v", g, m)
- 	}
- }
- 
-@@ -43,7 +43,7 @@ func TestUnmarshaler(t *testing.T) {
- 	m := &fakeUnmarshaler{}
- 	MustUnmarshal(m, data)
- 	if !reflect.DeepEqual(m.data, data) {
--		t.Errorf("data = %s, want %s", m.data, m)
-+		t.Errorf("data = %s, want #%v", m.data, m)
- 	}
- }
- 
--- 
-2.7.5
-

changelog

@@ -0,0 +1,426 @@
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.14-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sat Dec 26 16:38:31 CET 2020 Robert-André Mauchin <zebob.m@gmail.com> - 3.4.14-1
+- Update to 3.4.14
+- Close: rhbz#1901781
+
+* Fri Sep 04 00:08:52 CEST 2020 Robert-André Mauchin <zebob.m@gmail.com> - 3.4.13-1
+- Update to 3.4.13
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.7-3
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sun Apr 05 15:36:23 CEST 2020 Robert-André Mauchin <zebob.m@gmail.com> - 3.4.7-1
+- Update to 3.4.7
+
+* Mon Feb 17 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.3.13-5
+- Rebuilt for GHSA-jf24-p9p9-4rjh
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.13-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.13-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed Jul 10 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.3.13-2
+- Add Obsoletes for old name
+
+* Wed May 08 01:20:48 CEST 2019 Robert-André Mauchin <zebob.m@gmail.com> - 3.3.13-1
+- Release 3.3.13
+
+* Tue Apr 16 15:51:11 CET 2019 Robert-André Mauchin <zebob.m@gmail.com> - 3.3.12-4.20190413gitf29b1ad
+- etcd.service: do not pass command line flags already defined in environment
+
+* Mon Apr 15 15:11:24 CET 2019 Robert-André Mauchin <zebob.m@gmail.com> - 3.3.12-3.20190413gitf29b1ad
+- Fix building of etcd
+
+* Sat Apr 13 22:31:30 CET 2019 Robert-André Mauchin <zebob.m@gmail.com> - 3.3.12-2.20190413gitf29b1ad
+- Bump to commit f29b1ada19713544b698dab8c94c97cfa1e83dac
+
+* Thu Mar 14 2019 Robert-André Mauchin <zebob.m@gmail.com> - 3.3.12-1.20190314gite1ca3b4
+- Bump to commit e1ca3b4434945e57e8e3a451cdbde74a903cc8e1
+- Add new goipath
+- Updated patches
+- Updated man pages
+
+* Sun Feb 17 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.2.16-6
+- Fix broken version specification
+- Backport variadic parameter fix
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.16-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Oct 23 2018 Nicolas Mailhot <nim@fedoraproject.org> - 3.2.16-4
+- redhat-rpm-config-123 triggers bugs in gosetup, remove it from Go spec files as it’s just an alias
+- https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/RWD5YATAYAFWKIDZBB7EB6N5DAO4ZKFM/
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.16-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Mar 20 2018 Jan Chaloupka <jchaloup@redhat.com> - 3.2.16-2
+- Put back the missing prep, post, preun and postun scripts
+  resolves: #1557356
+
+* Fri Mar 09 2018 Jan Chaloupka <jchaloup@redhat.com> - 3.2.16-1.git121edf0
+- Update to 3.2.16
+
+* Tue Mar 06 2018 Jan Chaloupka <jchaloup@redhat.com> - 3.2.7-5.gitbb66589
+- Update to spec 3.0
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Nov 30 2017 Jan Chaloupka <jchaloup@redhat.com> - 3.2.7-3
+- Polish the spec file
+
+* Tue Nov 07 2017 Jan Chaloupka <jchaloup@redhat.com> - 3.2.7-2
+- Generate man pages
+
+* Sun Sep 24 2017 Jan Chaloupka <jchaloup@redhat.com> - 3.2.7-1
+- Update to 3.2.7
+  related: #1448611
+
+* Tue Aug 15 2017 Jan Chaloupka <jchaloup@redhat.com> - 3.2.5-1
+- Update to 3.2.5
+  resolves: #1448611
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sun Jun 11 2017 Jan Chaloupka <jchaloup@redhat.com> - 3.1.9-1
+- Update to 3.1.9
+  resolves: #1460496
+
+* Mon Jun 05 2017 Jan Chaloupka <jchaloup@redhat.com> - 3.1.8-1
+  Update to 3.1.8
+  resolves: #1458717
+
+* Tue May 02 2017 Jan Chaloupka <jchaloup@redhat.com> - 3.1.7-1
+- Update to 3.1.7
+  resolves: #1447232
+
+* Thu Apr 20 2017 Jan Chaloupka <jchaloup@redhat.com> - 3.1.6-1
+- Update to 3.1.6
+  resolves: #1444068
+
+* Tue Mar 28 2017 Jan Chaloupka <jchaloup@redhat.com> - 3.1.5-1
+- Update to 3.1.5
+  resolves: #1436452
+
+* Mon Mar 27 2017 Jan Chaloupka <jchaloup@redhat.com> - 3.1.4-1
+- Update to 3.1.4
+  resolves: #1435028
+
+* Mon Mar 20 2017 Jan Chaloupka <jchaloup@redhat.com> - 3.1.3-1
+- Update to v3.1.3
+  related: #1415341
+
+* Tue Mar 14 2017 Jan Chaloupka <jchaloup@redhat.com> - 3.1.0-1
+- Update to v3.1.0
+  related: #1415341
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Mon Jan 23 2017 Jan Chaloupka <jchaloup@redhat.com> - 3.0.17-1
+- Update to v3.0.17
+  etcd-top removed by upstream
+  resolves: #1415622
+
+* Fri Nov 18 2016 jchaloup <jchaloup@redhat.com> - 3.0.15-2
+- Remove ppc64le architecture restriction
+  resolves: #1396463
+
+* Tue Nov 15 2016 jchaloup <jchaloup@redhat.com> - 3.0.15-1
+- Update to v3.0.15
+  related: #1382965
+
+* Mon Nov 07 2016 jchaloup <jchaloup@redhat.com> - 3.0.14-1
+- Update to v3.0.14
+  related: #1382965
+
+* Thu Oct 27 2016 jchaloup <jchaloup@redhat.com> - 3.0.13-1
+- Update to v3.0.13
+  related: #1382965
+
+* Mon Oct 24 2016 jchaloup <jchaloup@redhat.com> - 3.0.12-2
+- Extend supported architectures with s390x
+
+* Thu Oct 13 2016 jchaloup <jchaloup@redhat.com> - 3.0.12-1
+- Update to v3.0.12
+  related: #1382965
+
+* Fri Sep 16 2016 jchaloup <jchaloup@redhat.com> - 3.0.9-1
+- Update to v3.0.9
+  related: #1374880
+
+* Wed Sep 14 2016 jchaloup <jchaloup@redhat.com> - 3.0.8-1
+- Update to v3.0.8
+  resolves: #1374880
+
+* Fri Sep 09 2016 jchaloup <jchaloup@redhat.com> - 3.0.7-1
+- Update to v3.0.7
+  resolves: #1370678
+
+* Tue Aug 16 2016 jchaloup <jchaloup@redhat.com> - 3.0.4-2
+- Hack test to provide ability to run unit-tests and integration tests
+  Still, keeping it disabled by default as it keeps failing
+  related: #1351818
+
+* Tue Aug 02 2016 jchaloup <jchaloup@redhat.com> - 3.0.4-1
+- Update to 3.0.4
+  related: #1351818
+
+* Thu Jul 28 2016 jchaloup <jchaloup@redhat.com> - 3.0.2-1
+- Update to 3.0.2
+  resolves: #1351818
+
+* Thu Jul 21 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.0-0.2.beta0
+- https://fedoraproject.org/wiki/Changes/golang1.7
+
+* Sun May 15 2016 jchaloup <jchaloup@redhat.com> - 3.0.0-0.1.beta0
+- Update to v3.0.0-beta0 (build from bundled until new deps appear in dist-git)
+  resolves: #1333988
+
+* Sat Apr 30 2016 jchaloup <jchaloup@redhat.com> - 2.3.3-1
+- Update to v2.3.3
+  resolves: #1331896
+
+* Fri Apr 22 2016 jchaloup <jchaloup@redhat.com> - 2.3.2-1
+- Update to v2.3.2
+  resolves: #1329438
+
+* Sat Apr  9 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2.3.1-3
+- Enable aarch64
+
+* Wed Apr 06 2016 jchaloup <jchaloup@redhat.com> - 2.3.1-2
+- Don't apply patch (for tests only which are disabled atm)
+
+* Mon Apr 04 2016 jchaloup <jchaloup@redhat.com> - 2.3.1-1
+- Update to v.2.3.1
+  resolves: #1323375
+
+* Sun Mar 20 2016 jchaloup <jchaloup@redhat.com> - 2.3.0-1
+- Update to v2.3.0
+  resolves: #1314441
+
+* Wed Mar 09 2016 jchaloup <jchaloup@redhat.com> - 2.2.5-4
+- Only ppc64le is supported, ppc64 not
+  related: #1315419
+
+* Tue Mar 08 2016 jchaloup <jchaloup@redhat.com> - 2.2.5-3
+- Extend archs to all supported
+  resolves: #1315419
+
+* Mon Feb 22 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.5-2
+- https://fedoraproject.org/wiki/Changes/golang1.6
+
+* Thu Feb 18 2016 jchaloup <jchaloup@redhat.com> - 2.2.5-1
+- Update to v2.2.5
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Thu Jan 21 2016 jchaloup <jchaloup@redhat.com> - 2.2.4-1
+- Update to v2.2.4
+  resolves: #1300558
+
+* Fri Jan 08 2016 jchaloup <jchaloup@redhat.com> - 2.2.3-1
+- Update to v2.2.3
+  resolves: #1296809
+
+* Tue Dec 29 2015 jchaloup <jchaloup@redhat.com> - 2.2.2-2
+- add missing options to etcd help (thanks to Joy Pu ypu@redhat.com)
+- add more information when running etcd as a service
+
+* Mon Dec 07 2015 jchaloup <jchaloup@redhat.com> - 2.2.2-1
+- Update to v2.2.2
+
+* Mon Nov 16 2015 jchaloup <jchaloup@redhat.com> - 2.2.1-4
+- Update etcd.conf: add new options, fix current
+
+* Fri Oct 30 2015 jchaloup <jchaloup@redhat.com> - 2.2.1-3
+- Add After=network-online.target and Wants=network-online.target
+  to etcd.service
+
+* Tue Oct 20 2015 jchaloup <jchaloup@redhat.com> - 2.2.1-2
+- Set Type=notify instead of simple in etcd.service (upstream #1576)
+  related: #1272438
+
+* Fri Oct 16 2015 jchaloup <jchaloup@redhat.com> - 2.2.1-1
+- Update to v2.2.1
+  resolves: #1272438
+
+* Fri Sep 11 2015 jchaloup <jchaloup@redhat.com> - 2.2.0-1
+- Update to v2.2.0 (etcd-migrate gone)
+- Update to spec-2.1
+  resolves: #1253864
+
+* Mon Aug 31 2015 jchaloup <jchaloup@redhat.com> - 2.1.2-1
+- Update to v2.1.2
+  resolves: #1258599
+
+* Thu Jul 30 2015 jchaloup <jchaloup@redhat.com> - 2.1.1-2
+- Enable debug info again
+  related: #1214958
+
+* Mon Jul 20 2015 jchaloup <jchaloup@redhat.com> - 2.1.1-1
+- fix definition of GOPATH for go1.5
+- fix definition of gobuild function for non-debug way
+- Update to v2.1.1
+  resolves: #1214958
+
+* Fri Jul 10 2015 jchaloup <jchaloup@redhat.com> - 2.0.13-3
+- set GOMAXPROCS to use all processors available
+
+* Mon Jun 29 2015 jchaloup <jchaloup@redhat.com> - 2.0.13-2
+- Remove -s option from -ldflags string as it removes symbol table
+  'go tool l6' gives explanation of all available options
+  resolves: #1236320
+
+* Fri Jun 26 2015 jchaloup <jchaloup@redhat.com> - 2.0.13-1
+- Update to v2.0.13
+
+* Thu Jun 25 2015 jchaloup <jchaloup@redhat.com> - 2.0.12-2
+- Add restart policy and set LimitNOFILE to/in etcd.service file
+- Update etcd.config file: add new flags and remove depricated
+- Update 'go build' flags for GIT_SHA (used in build script)
+- Don't use 4001 and 7001 ports in etcd.conf, they are replaced with 2379 and 2380
+
+* Wed Jun 24 2015 jchaloup <jchaloup@redhat.com> - 2.0.12-1
+- Update to v2.0.12
+- Polish spec file
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.11-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Fri May 22 2015 jchaloup <jchaloup@redhat.com> - 2.0.11-2
+- ETCD_ADVERTISE_CLIENT_URLS has to be set if ETCD_LISTEN_CLIENT_URLS is
+  related: #1222416
+
+* Mon May 18 2015 jchaloup <jchaloup@redhat.com> - 2.0.11-1
+- Update to v2.0.11
+  resolves: #1222416
+
+* Thu Apr 23 2015 jchaloup <jchaloup@redhat.com> - 2.0.10-1
+- Update to v2.0.10
+  resolves: #1214705
+
+* Wed Apr 08 2015 jchaloup <jchaloup@redhat.com> - 2.0.9-1
+- Update to v2.0.9
+  resolves: #1209666
+
+* Fri Apr 03 2015 jchaloup <jchaloup@redhat.com> - 2.0.8-0.2
+- Update spec file to fit for rhel too (thanks to eparis)
+  related: #1207881
+
+* Wed Apr 01 2015 jchaloup <jchaloup@redhat.com> - 2.0.8-0.1
+- Update to v2.0.8
+  resolves: #1207881
+
+* Tue Mar 31 2015 jchaloup <jchaloup@redhat.com> - 2.0.7-0.1
+- Update to v2.0.7
+  Add Godeps.json to doc
+  related: #1191441
+
+* Thu Mar 12 2015 jchaloup <jchaloup@redhat.com> - 2.0.5-0.1
+- Bump to 9481945228b97c5d019596b921d8b03833964d9e (v2.0.5)
+
+* Tue Mar 10 2015 Eric Paris <eparis@redhat.com> - 2.0.3-0.2
+- Fix .service files to work if no config file
+
+* Fri Feb 20 2015 jchaloup <jchaloup@redhat.com> - 2.0.3-0.1
+- Bump to upstream 4d728cc8c488a545a8bdeafd054d9ccc2bfb6876
+
+* Wed Feb 18 2015 jchaloup <jchaloup@redhat.com> - 2.0.1-0.2
+- Update configuration and service file
+  Fix depricated ErrWrongType after update of gogo/protobuf
+  related: #1191441
+
+* Wed Feb 11 2015 jchaloup <jchaloup@redhat.com> - 2.0.1-0.1
+- Update to 2.0.1
+  resolves: #1191441
+
+* Mon Feb 09 2015 jchaloup <jchaloup@redhat.com> - 2.0.0-0.5
+- Add missing debug info to binaries (patch from Jan Kratochvil)
+  resolves: #1184257
+
+* Fri Jan 30 2015 jchaloup <jchaloup@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 <jchaloup@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 <jchaloup@redhat.com> - 2.0.0-0.2.rc1
+- Update of BuildRequires/Requires, Provides and test
+  Add BuildRequire on jonboulle/clockwork
+  related: #1176138
+
+* Tue Dec 23 2014 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2.0.0-0.1.rc1
+- Resolves: rhbz#1176138 - update to v2.0.0-rc1
+- do not redefine gopath
+- use jonboulle/clockwork from within Godeps
+
+* Fri Oct 17 2014 jchaloup <jchaloup@redhat.com> - 0.4.6-7
+- Add ExclusiveArch for go_arches
+
+* Mon Oct 06 2014 jchaloup <jchaloup@redhat.com> - 0.4.6-6
+- related: #1047194
+  Remove dependency on go.net
+
+* Mon Oct 06 2014 jchaloup <jchaloup@redhat.com> - 0.4.6-5
+- Fix the .service file so it can launch!
+  related: #1047194
+
+* Mon Sep 22 2014 jchaloup <jchaloup@redhat.com> - 0.4.6-4
+- resolves: #1047194
+  Update to 0.4.6 from https://github.com/projectatomic/etcd-package
+
+* Tue Aug 19 2014 Adam Miller <maxamillion@fedoraproject.org> - 0.4.6-3
+- Add devel sub-package
+
+* Wed Aug 13 2014 Eric Paris <eparis@redhat.com> - 0.4.6-2
+- Bump to 0.4.6
+- run as etcd, not root
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun Oct 20 2013 Peter Lemenkov <lemenkov@gmail.com> - 0.1.2-5
+- goprotobuf library unbundled (see rhbz #1018477)
+- go-log library unbundled (see rhbz #1018478)
+- go-raft library unbundled (see rhbz #1018479)
+- go-systemd library unbundled (see rhbz #1018480)
+- kardianos library unbundled (see rhbz #1018481)
+
+* Sun Oct 13 2013 Peter Lemenkov <lemenkov@gmail.com> - 0.1.2-4
+- go.net library unbundled (see rhbz #1018476)
+
+* Sat Oct 12 2013 Peter Lemenkov <lemenkov@gmail.com> - 0.1.2-3
+- Prepare for packages unbundling
+- Verbose build
+
+* Sat Oct 12 2013 Peter Lemenkov <lemenkov@gmail.com> - 0.1.2-2
+- Fix typo in the etc.service file
+
+* Sat Oct 12 2013 Peter Lemenkov <lemenkov@gmail.com> - 0.1.2-1
+- Ver. 0.1.2
+- Integrate with systemd
+
+* Mon Aug 26 2013 Luke Cypret <cypret@fedoraproject.org> - 0.1.1-1
+- Initial creation

etcd.service

@@ -10,7 +10,7 @@ WorkingDirectory=/var/lib/etcd/
 EnvironmentFile=-/etc/etcd/etcd.conf
 User=etcd
 # set GOMAXPROCS to number of processors
-ExecStart=/bin/bash -c "GOMAXPROCS=$(nproc) /usr/bin/etcd --name=\"${ETCD_NAME}\" --data-dir=\"${ETCD_DATA_DIR}\" --listen-client-urls=\"${ETCD_LISTEN_CLIENT_URLS}\""
+ExecStart=/bin/bash -c "GOMAXPROCS=$(nproc) /usr/bin/etcd"
 Restart=on-failure
 LimitNOFILE=65536
 

etcd.spec

@@ -1,165 +1,131 @@
-# http://github.com/coreos/etcd
-%global goipath         github.com/coreos/etcd
-Version:	        3.2.16
+# Generated by go2rpm 1.8.2
+%bcond_without check
+%bcond_with bootstrap
+
+%if %{with bootstrap}
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^golang\\(.*\\)$
+%endif
+
+# https://github.com/etcd-io/etcd
+%global goipath         go.etcd.io/etcd
+%global forgeurl        https://github.com/etcd-io/etcd
+Version:                3.5.13
 
 %gometa
 
-%global man_version     3.2.16
+%global common_description %{expand:
+Distributed reliable key-value store for the most critical data of a distributed
+system.}
+
+%global golicenses      LICENSE NOTICE
+%global godocs          CONTRIBUTING.md README.md Documentation\\\
+                        README-*.md READMEv2-etcdctl.md
+
+%global gosupfiles      client/v2/example_keys_test.go\\\
+                        client/v3/clientv3util/example_key_test.go\\\
+                        client/v3/concurrency/example_election_test.go\\\
+                        client/v3/concurrency/example_mutex_test.go\\\
+                        client/v3/concurrency/example_stm_test.go\\\
+                        client/v3/example_auth_test.go\\\
+                        client/v3/example_cluster_test.go\\\
+                        client/v3/example_kv_test.go\\\
+                        client/v3/example_lease_test.go\\\
+                        client/v3/example_maintenance_test.go\\\
+                        client/v3/example_metrics_test.go\\\
+                        client/v3/example_test.go\\\
+                        client/v3/example_watch_test.go
 
 Name:           etcd
-Release:	6%{?dist}
-Summary:	A highly-available key value store for shared configuration
-License:	ASL 2.0
+Release:        %autorelease
+Summary:        Distributed reliable key-value store for the most critical data of a distributed system
+
+License:        Apache-2.0
 URL:            %{gourl}
 Source0:        %{gosource}
-Source1:	%{name}.service
-Source2:	%{name}.conf
-Source3:        man-%{man_version}.tar.gz
+Source1:        %{name}.service
+Source2:        %{name}.conf
 
-Patch0:         Fix-format-errors.patch
-Patch1:         https://github.com/etcd-io/etcd/commit/1136ba0e0d4ab628cb13ffd76da47dbea357d0a6.patch
+BuildRequires:  python3-devel
+BuildRequires:  systemd-rpm-macros
 
-BuildRequires: golang(github.com/bgentry/speakeasy)
-BuildRequires: golang(github.com/boltdb/bolt)
-BuildRequires: golang(github.com/cheggaaa/pb)
-BuildRequires: golang(github.com/cockroachdb/cmux)
-BuildRequires: golang(github.com/coreos/go-semver/semver)
-BuildRequires: golang(github.com/coreos/go-systemd/daemon)
-BuildRequires: golang(github.com/coreos/go-systemd/util)
-BuildRequires: golang(github.com/coreos/pkg/capnslog)
-BuildRequires: golang(github.com/dgrijalva/jwt-go)
-BuildRequires: golang(github.com/dustin/go-humanize)
-BuildRequires: golang(github.com/ghodss/yaml)
-BuildRequires: golang(github.com/gogo/protobuf/proto)
-BuildRequires: golang(github.com/golang/groupcache/lru)
-BuildRequires: golang(github.com/golang/protobuf/proto)
-BuildRequires: golang(github.com/google/btree)
-BuildRequires: golang(github.com/grpc-ecosystem/go-grpc-prometheus)
-BuildRequires: golang(github.com/grpc-ecosystem/grpc-gateway/runtime)
-BuildRequires: golang(github.com/grpc-ecosystem/grpc-gateway/utilities)
-BuildRequires: golang(github.com/jonboulle/clockwork)
-BuildRequires: golang(github.com/kr/pty)
-BuildRequires: golang(github.com/olekukonko/tablewriter)
-BuildRequires: golang(github.com/prometheus/client_golang/prometheus)
-BuildRequires: golang(github.com/spf13/cobra)
-BuildRequires: golang(github.com/spf13/pflag)
-BuildRequires: golang(github.com/ugorji/go/codec)
-BuildRequires: golang(github.com/urfave/cli)
-BuildRequires: golang(github.com/xiang90/probing)
-BuildRequires: golang(golang.org/x/crypto/bcrypt)
-BuildRequires: golang(golang.org/x/net/context)
-BuildRequires: golang(golang.org/x/net/http2)
-BuildRequires: golang(golang.org/x/net/trace)
-BuildRequires: golang(golang.org/x/time/rate)
-BuildRequires: golang(google.golang.org/grpc)
-BuildRequires: golang(google.golang.org/grpc/codes)
-BuildRequires: golang(google.golang.org/grpc/credentials)
-BuildRequires: golang(google.golang.org/grpc/grpclog)
-BuildRequires: golang(google.golang.org/grpc/metadata)
-BuildRequires: golang(google.golang.org/grpc/naming)
-BuildRequires: golang(google.golang.org/grpc/peer)
-BuildRequires: golang(google.golang.org/grpc/transport)
+%description %{common_description}
 
-BuildRequires:	systemd
-
-%description
-A highly-available key value store for shared configuration.
-
-%package devel
-Summary:        etcd golang devel libraries
-BuildArch:      noarch
-
-BuildRequires: golang(github.com/bgentry/speakeasy)
-BuildRequires: golang(github.com/cheggaaa/pb)
-BuildRequires: golang(github.com/cockroachdb/cmux)
-BuildRequires: golang(github.com/coreos/bbolt)
-BuildRequires: golang(github.com/coreos/go-semver/semver)
-BuildRequires: golang(github.com/coreos/go-systemd/daemon)
-BuildRequires: golang(github.com/coreos/go-systemd/util)
-BuildRequires: golang(github.com/coreos/pkg/capnslog)
-BuildRequires: golang(github.com/dgrijalva/jwt-go)
-BuildRequires: golang(github.com/dustin/go-humanize)
-BuildRequires: golang(github.com/ghodss/yaml)
-BuildRequires: golang(github.com/gogo/protobuf/proto)
-BuildRequires: golang(github.com/golang/groupcache/lru)
-BuildRequires: golang(github.com/golang/protobuf/proto)
-BuildRequires: golang(github.com/google/btree)
-BuildRequires: golang(github.com/grpc-ecosystem/go-grpc-prometheus)
-BuildRequires: golang(github.com/grpc-ecosystem/grpc-gateway/runtime)
-BuildRequires: golang(github.com/grpc-ecosystem/grpc-gateway/utilities)
-BuildRequires: golang(github.com/jonboulle/clockwork)
-BuildRequires: golang(github.com/kr/pty)
-BuildRequires: golang(github.com/olekukonko/tablewriter)
-BuildRequires: golang(github.com/prometheus/client_golang/prometheus)
-BuildRequires: golang(github.com/spf13/cobra)
-BuildRequires: golang(github.com/spf13/pflag)
-BuildRequires: golang(github.com/ugorji/go/codec)
-BuildRequires: golang(github.com/urfave/cli)
-BuildRequires: golang(github.com/xiang90/probing)
-BuildRequires: golang(golang.org/x/crypto/bcrypt)
-BuildRequires: golang(golang.org/x/net/context)
-BuildRequires: golang(golang.org/x/net/http2)
-BuildRequires: golang(golang.org/x/net/trace)
-BuildRequires: golang(golang.org/x/time/rate)
-BuildRequires: golang(google.golang.org/genproto/googleapis/api/annotations)
-BuildRequires: golang(google.golang.org/grpc)
-BuildRequires: golang(google.golang.org/grpc/codes)
-BuildRequires: golang(google.golang.org/grpc/credentials)
-BuildRequires: golang(google.golang.org/grpc/grpclog)
-BuildRequires: golang(google.golang.org/grpc/health/grpc_health_v1)
-BuildRequires: golang(google.golang.org/grpc/keepalive)
-BuildRequires: golang(google.golang.org/grpc/metadata)
-BuildRequires: golang(google.golang.org/grpc/naming)
-BuildRequires: golang(google.golang.org/grpc/peer)
-BuildRequires: golang(google.golang.org/grpc/status)
-
-%description devel
-golang development libraries for etcd, a highly-available key value store for
-shared configuration.
+%gopkg
 
 %prep
-%setup -q -n man-%{man_version} -T -b 3
-%forgesetup
-%patch0 -p1
-%patch1 -p1
+%goprep -k
+rm -rf vendor/
+rm -rf cmd/vendor
+rm -rf raft/rafttest
 
-mkdir -p man/man1
-cp ../man-%{man_version}/*.1 man/man1/.
+for d in contrib etcdctl etcdutl pkg raft hack security; do
+mv $d/README.md README-$d.md
+done
+mv etcdctl/READMEv2.md READMEv2-etcdctl.md
+mv client/v2/README.md README-clientv2.md
+mv client/v3/README.md README-clientv3.md
 
-sed -i 's/"gopkg\.in\/cheggaaa\/pb\.v1/"github\.com\/cheggaaa\/pb/g' $(find . -name '*.go')
-#"
+mkdir -p api/v3/ client/pkg/v3 etcdctl/v3 etcdutl/v3 pkg/v3 raft/v3 server/v3 tools/v3
+shopt -s extglob
+mv api/!(v3) api/v3/.
+mv client/pkg/!(v3) client/pkg/v3/.
+mv etcdctl/!(v3) etcdctl/v3/.
+mv etcdutl/!(v3) etcdutl/v3/.
+mv pkg/!(v3) pkg/v3/.
+mv raft/!(v3) raft/v3/.
+mv server/!(v3) server/v3/.
+mv tools/!(v3) tools/v3/.
+shopt -u extglob
+
+
+%if %{without bootstrap}
+%generate_buildrequires
+%go_generate_buildrequires
+
+# Create a sysusers.d config file
+cat >etcd.sysusers.conf <<EOF
+u etcd - 'etcd user' %{_sharedstatedir}/%{name} -
+EOF
 
 %build
-%gobuildroot
-
-%gobuild -o _bin/etcd    %{goipath}/cmd/etcd
-%gobuild -o _bin/etcdctl %{goipath}/cmd/etcdctl
+%gobuild -o %{gobuilddir}/bin/etcd %{goipath}/server/v3
+%gobuild -o %{gobuilddir}/bin/etcdctl %{goipath}/etcdctl/v3
+%gobuild -o %{gobuilddir}/bin/etcdutl %{goipath}/etcdutl/v3
+%endif
 
 %install
-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 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
-install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}
-install -m 644 -t %{buildroot}%{_sysconfdir}/%{name} %{SOURCE2}
+%gopkginstall
 
-# install manpages
-install -d %{buildroot}%{_mandir}/man1
-install -p -m 644 man/man1/* %{buildroot}%{_mandir}/man1
+%if %{without bootstrap}
+install -m 0755 -vd                     %{buildroot}%{_bindir}
+install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
+
+install -Dpm 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
+install -dm 0755 %{buildroot}%{_sysconfdir}/%{name}
+install -pm 644 -t %{buildroot}%{_sysconfdir}/%{name} %{SOURCE2}
 
 # And create /var/lib/etcd
-install -d -m 0755 %{buildroot}%{_sharedstatedir}/%{name}
+install -dm 0755 %{buildroot}%{_sharedstatedir}/%{name}
 
-# source codes for building projects
-%goinstall integration/fixtures etcdserver/api/v2http/testdata
+install -m0644 -D etcd.sysusers.conf %{buildroot}%{_sysusersdir}/etcd.conf
 
+%if %{with check}
 %check
-# tools/functional-tester/etcd-agent expects etcd binary at GOPATH/bin/etcd
-%gochecks -d clientv3 -d e2e -d tools/functional-tester/etcd-agent -d integration -d clientv3/integration
+%gocheck -d client/v2 \
+         -d client/v3 \
+         -d raft/v3 \
+         -d server/v3/auth \
+         -d server/v3/wal/walpb \
+         -d tests/e2ev \
+         -d tests/integration \
+         -d tests/e2e \
+         -d tests/integration/client \
+         -t tests/integration/clientv3 \
+         -d server/v3/etcdserver/api/membership \
+         -d server/v3/mvcc/backend \
+         -d pkg/v3/proxy
+%endif
 
-%pre
-getent group %{name} >/dev/null || groupadd -r %{name}
-getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/%{name} \
-	-s /sbin/nologin -c "etcd user" %{name}
 
 %post
 %systemd_post %{name}.service
@@ -170,396 +136,18 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/
 %postun
 %systemd_postun %{name}.service
 
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
-
 %files
 %license LICENSE
-%doc *.md
+%doc CONTRIBUTING.md README.md
+%doc Documentation README-*.md READMEv2-etcdctl.md
+%{_bindir}/*
 %config(noreplace) %{_sysconfdir}/%{name}
-%{_bindir}/%{name}
-%{_bindir}/%{name}ctl
 %dir %attr(-,%{name},%{name}) %{_sharedstatedir}/%{name}
 %{_unitdir}/%{name}.service
-%{_mandir}/man1/*.1*
+%endif
 
-%files devel -f devel.file-list
-%license LICENSE
-%doc *.md
-%doc glide.lock
+%gopkgfiles
+%{_sysusersdir}/etcd.conf
 
 %changelog
-* Sun Feb 17 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.2.16-6
-- Fix broken version specification
-- Backport variadic parameter fix
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.16-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Oct 23 2018 Nicolas Mailhot <nim@fedoraproject.org>
-- 3.2.16-4
-- redhat-rpm-config-123 triggers bugs in gosetup, remove it from Go spec files as it’s just an alias
-- https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/RWD5YATAYAFWKIDZBB7EB6N5DAO4ZKFM/
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.16-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Mar 20 2018 Jan Chaloupka <jchaloup@redhat.com> - 3.2.16-2
-- Put back the missing prep, post, preun and postun scripts
-  resolves: #1557356
-
-* Fri Mar 09 2018 Jan Chaloupka <jchaloup@redhat.com> - 3.2.16-1.git121edf0
-- Update to 3.2.16
-
-* Tue Mar 06 2018 Jan Chaloupka <jchaloup@redhat.com> - 3.2.7-5.gitbb66589
-- Update to spec 3.0
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.7-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Nov 30 2017 Jan Chaloupka <jchaloup@redhat.com> - 3.2.7-3
-- Polish the spec file
-
-* Tue Nov 07 2017 Jan Chaloupka <jchaloup@redhat.com> - 3.2.7-2
-- Generate man pages
-
-* Sun Sep 24 2017 Jan Chaloupka <jchaloup@redhat.com> - 3.2.7-1
-- Update to 3.2.7
-  related: #1448611
-
-* Tue Aug 15 2017 Jan Chaloupka <jchaloup@redhat.com> - 3.2.5-1
-- Update to 3.2.5
-  resolves: #1448611
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sun Jun 11 2017 Jan Chaloupka <jchaloup@redhat.com> - 3.1.9-1
-- Update to 3.1.9
-  resolves: #1460496
-
-* Mon Jun 05 2017 Jan Chaloupka <jchaloup@redhat.com> - 3.1.8-1
-  Update to 3.1.8
-  resolves: #1458717
-
-* Tue May 02 2017 Jan Chaloupka <jchaloup@redhat.com> - 3.1.7-1
-- Update to 3.1.7
-  resolves: #1447232
-
-* Thu Apr 20 2017 Jan Chaloupka <jchaloup@redhat.com> - 3.1.6-1
-- Update to 3.1.6
-  resolves: #1444068
-
-* Tue Mar 28 2017 Jan Chaloupka <jchaloup@redhat.com> - 3.1.5-1
-- Update to 3.1.5
-  resolves: #1436452
-
-* Mon Mar 27 2017 Jan Chaloupka <jchaloup@redhat.com> - 3.1.4-1
-- Update to 3.1.4
-  resolves: #1435028
-
-* Mon Mar 20 2017 Jan Chaloupka <jchaloup@redhat.com> - 3.1.3-1
-- Update to v3.1.3
-  related: #1415341
-
-* Tue Mar 14 2017 Jan Chaloupka <jchaloup@redhat.com> - 3.1.0-1
-- Update to v3.1.0
-  related: #1415341
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.17-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Jan 23 2017 Jan Chaloupka <jchaloup@redhat.com> - 3.0.17-1
-- Update to v3.0.17
-  etcd-top removed by upstream
-  resolves: #1415622
-
-* Fri Nov 18 2016 jchaloup <jchaloup@redhat.com> - 3.0.15-2
-- Remove ppc64le architecture restriction
-  resolves: #1396463
-
-* Tue Nov 15 2016 jchaloup <jchaloup@redhat.com> - 3.0.15-1
-- Update to v3.0.15
-  related: #1382965
-
-* Mon Nov 07 2016 jchaloup <jchaloup@redhat.com> - 3.0.14-1
-- Update to v3.0.14
-  related: #1382965
-
-* Thu Oct 27 2016 jchaloup <jchaloup@redhat.com> - 3.0.13-1
-- Update to v3.0.13
-  related: #1382965
-
-* Mon Oct 24 2016 jchaloup <jchaloup@redhat.com> - 3.0.12-2
-- Extend supported architectures with s390x
-
-* Thu Oct 13 2016 jchaloup <jchaloup@redhat.com> - 3.0.12-1
-- Update to v3.0.12
-  related: #1382965
-
-* Fri Sep 16 2016 jchaloup <jchaloup@redhat.com> - 3.0.9-1
-- Update to v3.0.9
-  related: #1374880
-
-* Wed Sep 14 2016 jchaloup <jchaloup@redhat.com> - 3.0.8-1
-- Update to v3.0.8
-  resolves: #1374880
-
-* Fri Sep 09 2016 jchaloup <jchaloup@redhat.com> - 3.0.7-1
-- Update to v3.0.7
-  resolves: #1370678
-
-* Tue Aug 16 2016 jchaloup <jchaloup@redhat.com> - 3.0.4-2
-- Hack test to provide ability to run unit-tests and integration tests
-  Still, keeping it disabled by default as it keeps failing
-  related: #1351818
-
-* Tue Aug 02 2016 jchaloup <jchaloup@redhat.com> - 3.0.4-1
-- Update to 3.0.4
-  related: #1351818
-
-* Thu Jul 28 2016 jchaloup <jchaloup@redhat.com> - 3.0.2-1
-- Update to 3.0.2
-  resolves: #1351818
-
-* Thu Jul 21 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.0-0.2.beta0
-- https://fedoraproject.org/wiki/Changes/golang1.7
-
-* Sun May 15 2016 jchaloup <jchaloup@redhat.com> - 3.0.0-0.1.beta0
-- Update to v3.0.0-beta0 (build from bundled until new deps appear in dist-git)
-  resolves: #1333988
-
-* Sat Apr 30 2016 jchaloup <jchaloup@redhat.com> - 2.3.3-1
-- Update to v2.3.3
-  resolves: #1331896
-
-* Fri Apr 22 2016 jchaloup <jchaloup@redhat.com> - 2.3.2-1
-- Update to v2.3.2
-  resolves: #1329438
-
-* Sat Apr  9 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2.3.1-3
-- Enable aarch64
-
-* Wed Apr 06 2016 jchaloup <jchaloup@redhat.com> - 2.3.1-2
-- Don't apply patch (for tests only which are disabled atm)
-
-* Mon Apr 04 2016 jchaloup <jchaloup@redhat.com> - 2.3.1-1
-- Update to v.2.3.1
-  resolves: #1323375
-
-* Sun Mar 20 2016 jchaloup <jchaloup@redhat.com> - 2.3.0-1
-- Update to v2.3.0
-  resolves: #1314441
-
-* Wed Mar 09 2016 jchaloup <jchaloup@redhat.com> - 2.2.5-4
-- Only ppc64le is supported, ppc64 not
-  related: #1315419
-
-* Tue Mar 08 2016 jchaloup <jchaloup@redhat.com> - 2.2.5-3
-- Extend archs to all supported
-  resolves: #1315419
-
-* Mon Feb 22 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.5-2
-- https://fedoraproject.org/wiki/Changes/golang1.6
-
-* Thu Feb 18 2016 jchaloup <jchaloup@redhat.com> - 2.2.5-1
-- Update to v2.2.5
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Thu Jan 21 2016 jchaloup <jchaloup@redhat.com> - 2.2.4-1
-- Update to v2.2.4
-  resolves: #1300558
-
-* Fri Jan 08 2016 jchaloup <jchaloup@redhat.com> - 2.2.3-1
-- Update to v2.2.3
-  resolves: #1296809
-
-* Tue Dec 29 2015 jchaloup <jchaloup@redhat.com> - 2.2.2-2
-- add missing options to etcd help (thanks to Joy Pu ypu@redhat.com)
-- add more information when running etcd as a service
-
-* Mon Dec 07 2015 jchaloup <jchaloup@redhat.com> - 2.2.2-1
-- Update to v2.2.2
-
-* Mon Nov 16 2015 jchaloup <jchaloup@redhat.com> - 2.2.1-4
-- Update etcd.conf: add new options, fix current
-
-* Fri Oct 30 2015 jchaloup <jchaloup@redhat.com> - 2.2.1-3
-- Add After=network-online.target and Wants=network-online.target
-  to etcd.service
-
-* Tue Oct 20 2015 jchaloup <jchaloup@redhat.com> - 2.2.1-2
-- Set Type=notify instead of simple in etcd.service (upstream #1576)
-  related: #1272438
-
-* Fri Oct 16 2015 jchaloup <jchaloup@redhat.com> - 2.2.1-1
-- Update to v2.2.1
-  resolves: #1272438
-
-* Fri Sep 11 2015 jchaloup <jchaloup@redhat.com> - 2.2.0-1
-- Update to v2.2.0 (etcd-migrate gone)
-- Update to spec-2.1
-  resolves: #1253864
-
-* Mon Aug 31 2015 jchaloup <jchaloup@redhat.com> - 2.1.2-1
-- Update to v2.1.2
-  resolves: #1258599
-
-* Thu Jul 30 2015 jchaloup <jchaloup@redhat.com> - 2.1.1-2
-- Enable debug info again
-  related: #1214958
-
-* Mon Jul 20 2015 jchaloup <jchaloup@redhat.com> - 2.1.1-1
-- fix definition of GOPATH for go1.5
-- fix definition of gobuild function for non-debug way
-- Update to v2.1.1
-  resolves: #1214958
-
-* Fri Jul 10 2015 jchaloup <jchaloup@redhat.com> - 2.0.13-3
-- set GOMAXPROCS to use all processors available
-
-* Mon Jun 29 2015 jchaloup <jchaloup@redhat.com> - 2.0.13-2
-- Remove -s option from -ldflags string as it removes symbol table
-  'go tool l6' gives explanation of all available options
-  resolves: #1236320
-
-* Fri Jun 26 2015 jchaloup <jchaloup@redhat.com> - 2.0.13-1
-- Update to v2.0.13
-
-* Thu Jun 25 2015 jchaloup <jchaloup@redhat.com> - 2.0.12-2
-- Add restart policy and set LimitNOFILE to/in etcd.service file
-- Update etcd.config file: add new flags and remove depricated
-- Update 'go build' flags for GIT_SHA (used in build script)
-- Don't use 4001 and 7001 ports in etcd.conf, they are replaced with 2379 and 2380
-
-* Wed Jun 24 2015 jchaloup <jchaloup@redhat.com> - 2.0.12-1
-- Update to v2.0.12
-- Polish spec file
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.11-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Fri May 22 2015 jchaloup <jchaloup@redhat.com> - 2.0.11-2
-- ETCD_ADVERTISE_CLIENT_URLS has to be set if ETCD_LISTEN_CLIENT_URLS is
-  related: #1222416
-
-* Mon May 18 2015 jchaloup <jchaloup@redhat.com> - 2.0.11-1
-- Update to v2.0.11
-  resolves: #1222416
-
-* Thu Apr 23 2015 jchaloup <jchaloup@redhat.com> - 2.0.10-1
-- Update to v2.0.10
-  resolves: #1214705
-
-* Wed Apr 08 2015 jchaloup <jchaloup@redhat.com> - 2.0.9-1
-- Update to v2.0.9
-  resolves: #1209666
-
-* Fri Apr 03 2015 jchaloup <jchaloup@redhat.com> - 2.0.8-0.2
-- Update spec file to fit for rhel too (thanks to eparis)
-  related: #1207881
-
-* Wed Apr 01 2015 jchaloup <jchaloup@redhat.com> - 2.0.8-0.1
-- Update to v2.0.8
-  resolves: #1207881
-
-* Tue Mar 31 2015 jchaloup <jchaloup@redhat.com> - 2.0.7-0.1
-- Update to v2.0.7
-  Add Godeps.json to doc
-  related: #1191441
-
-* Thu Mar 12 2015 jchaloup <jchaloup@redhat.com> - 2.0.5-0.1
-- Bump to 9481945228b97c5d019596b921d8b03833964d9e (v2.0.5)
-
-* Tue Mar 10 2015 Eric Paris <eparis@redhat.com> - 2.0.3-0.2
-- Fix .service files to work if no config file
-
-* Fri Feb 20 2015 jchaloup <jchaloup@redhat.com> - 2.0.3-0.1
-- Bump to upstream 4d728cc8c488a545a8bdeafd054d9ccc2bfb6876
-
-* Wed Feb 18 2015 jchaloup <jchaloup@redhat.com> - 2.0.1-0.2
-- Update configuration and service file
-  Fix depricated ErrWrongType after update of gogo/protobuf
-  related: #1191441
-
-* Wed Feb 11 2015 jchaloup <jchaloup@redhat.com> - 2.0.1-0.1
-- Update to 2.0.1
-  resolves: #1191441
-
-* Mon Feb 09 2015 jchaloup <jchaloup@redhat.com> - 2.0.0-0.5
-- Add missing debug info to binaries (patch from Jan Kratochvil)
-  resolves: #1184257
-
-* Fri Jan 30 2015 jchaloup <jchaloup@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 <jchaloup@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 <jchaloup@redhat.com> - 2.0.0-0.2.rc1
-- Update of BuildRequires/Requires, Provides and test
-  Add BuildRequire on jonboulle/clockwork
-  related: #1176138
-
-* Tue Dec 23 2014 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2.0.0-0.1.rc1
-- Resolves: rhbz#1176138 - update to v2.0.0-rc1
-- do not redefine gopath
-- use jonboulle/clockwork from within Godeps
-
-* Fri Oct 17 2014 jchaloup <jchaloup@redhat.com> - 0.4.6-7
-- Add ExclusiveArch for go_arches
-
-* Mon Oct 06 2014 jchaloup <jchaloup@redhat.com> - 0.4.6-6
-- related: #1047194
-  Remove dependency on go.net
-
-* Mon Oct 06 2014 jchaloup <jchaloup@redhat.com> - 0.4.6-5
-- Fix the .service file so it can launch!
-  related: #1047194
-
-* Mon Sep 22 2014 jchaloup <jchaloup@redhat.com> - 0.4.6-4
-- resolves: #1047194
-  Update to 0.4.6 from https://github.com/projectatomic/etcd-package
-
-* Tue Aug 19 2014 Adam Miller <maxamillion@fedoraproject.org> - 0.4.6-3
-- Add devel sub-package
-
-* Wed Aug 13 2014 Eric Paris <eparis@redhat.com> - 0.4.6-2
-- Bump to 0.4.6
-- run as etcd, not root
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.2-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sun Oct 20 2013 Peter Lemenkov <lemenkov@gmail.com> - 0.1.2-5
-- goprotobuf library unbundled (see rhbz #1018477)
-- go-log library unbundled (see rhbz #1018478)
-- go-raft library unbundled (see rhbz #1018479)
-- go-systemd library unbundled (see rhbz #1018480)
-- kardianos library unbundled (see rhbz #1018481)
-
-* Sun Oct 13 2013 Peter Lemenkov <lemenkov@gmail.com> - 0.1.2-4
-- go.net library unbundled (see rhbz #1018476)
-
-* Sat Oct 12 2013 Peter Lemenkov <lemenkov@gmail.com> - 0.1.2-3
-- Prepare for packages unbundling
-- Verbose build
-
-* Sat Oct 12 2013 Peter Lemenkov <lemenkov@gmail.com> - 0.1.2-2
-- Fix typo in the etc.service file
-
-* Sat Oct 12 2013 Peter Lemenkov <lemenkov@gmail.com> - 0.1.2-1
-- Ver. 0.1.2
-- Integrate with systemd
-
-* Mon Aug 26 2013 Luke Cypret <cypret@fedoraproject.org> - 0.1.1-1
-- Initial creation
+%autochangelog

etcdctl.1

@@ -1,25 +0,0 @@
-.TH "ETCD" "1" " etcd User Manuals" "Jan Chaloupka" "Oct 2017"  ""
-
-
-.SH NAME
-.PP
-etcdctl \- A simple command line client for etcd
-
-
-.SH SYNOPSIS
-.PP
-\fB[ETCDCTL_API=3] etctctl\fP [OPTIONS]
-
-
-.SH DESCRIPTION
-.PP
-Command line client for etcd.
-Queries to v2 data model are available through \fBetcdtl\fP command (see \fBetcdctl2(1)\fP).
-Queries to v3 data model are available through \fBETCDCTL=3 etcdtl\fP command (see \fBetcdctl3(1)\fP).
-
-.PP
-Find more information at 
-\[la]https://github.com/coreos/etcd\[ra].
-
-.SH SEE ALSO
-\fBetcd(1)\fP, \fBetcdctl2(1)\fP, \fBetcdctl3(1)\fP

etcdmain-Add-max-snapshots-and-max-wals-to-help.patch

@@ -1,41 +0,0 @@
-From ddc4f8bd4501826e4c551952a96fcca6dd25bf64 Mon Sep 17 00:00:00 2001
-From: Yiqiao Pu <ypu@redhat.com>
-Date: Wed, 18 Nov 2015 17:54:46 +0800
-Subject: [PATCH] etcdmain: Add max-snapshots and max-wals to help
-
-Based on the configuration doc, seems these two flags are missing
-in the help. So add them and the descriptions are from config.go in
-the same directory.
-
-Signed-off-by: Yiqiao Pu <ypu@redhat.com>
----
- etcdmain/help.go | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/etcdmain/help.go b/etcdmain/help.go
-index e233320..fd23d59 100644
---- a/etcdmain/help.go
-+++ b/etcdmain/help.go
-@@ -14,6 +14,8 @@
- 
- package etcdmain
- 
-+import "strconv"
-+
- var (
- 	usageline = `usage: etcd [flags]
-        start an etcd server
-@@ -43,6 +45,10 @@ member flags:
- 		list of URLs to listen on for peer traffic.
- 	--listen-client-urls 'http://localhost:2379,http://localhost:4001'
- 		list of URLs to listen on for client traffic.
-+	--max-snapshots '` + strconv.Itoa(defaultMaxSnapshots) + `'
-+		maximum number of snapshot files to retain (0 is unlimited).
-+	--max-wals '` + strconv.Itoa(defaultMaxWALs) + `'
-+		maximum number of wal files to retain (0 is unlimited).
- 	-cors ''
- 		comma-separated whitelist of origins for CORS (cross-origin resource sharing).
- 
--- 
-1.9.3
-

genmanpages.sh

@@ -1,35 +0,0 @@
-#!/bin/sh
-
-rm -rf man
-mkdir -p man/etcdctl2 man/etcdctl3
-pushd man/etcdctl3
-ETCDCTL_API=3 ../../$1/bin/etcdctl --help
-
-# rename to etcdctl3...
-for line in $(ls *.1); do mv $line $(echo $line | sed "s/etcdctl/etcdctl3/"); done
-
-# rename refs
-sed -i "s/\\\fBetcdctl\\\-/\\\fBetcdctl3\\\-/g" *.1
-
-# stress ETCDCTL_API use
-sed -i s"/^\\\fBetcdctl /\\\fBETCDCTL=3 etcdctl /" etcdctl3*.1
-
-cd ../etcdctl2
-../../$1/bin/etcdctl --help > etcdctl.1
-
-for cmd in $(cat etcdctl.1 | grep "\fBetcdctl" | cut -d'-' -f2-3 | cut -d'(' -f1); do ../../$1/bin/etcdctl $cmd --help > etcdctl-$cmd.1; done
-
-# rename to etcdctl2
-for line in $(ls *.1); do mv $line $(echo $line | sed "s/etcdctl/etcdctl2/"); done
-
-# rename refs
-sed -i "s/\\\fBetcdctl-/\\\fBetcdctl2-/g" *.1
-
-cd ..
-mv etcdctl2/* .
-mv etcdctl3/* .
-rm -rf etcdctl2 etcdctl3
-cp ../etcdctl.1 .
-
-# Gen etcd.1
-../$1/bin/etcd --help > etcd.1

hack-test.patch

@@ -1,73 +0,0 @@
-From a144093e502d4529d598ecf997fea9e261ac595d Mon Sep 17 00:00:00 2001
-From: Jan Chaloupka <jchaloup@redhat.com>
-Date: Mon, 15 Aug 2016 16:09:52 +0200
-Subject: [PATCH] hack test
-
----
- test | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/test b/test
-index 4f24606..deaa527 100755
---- a/test
-+++ b/test
-@@ -53,7 +53,7 @@ fi
- function unit_tests {
- 	echo "Running tests..."
- 	# only -run=Test so examples can run in integration tests
--	go test -timeout 3m ${COVER} ${RACE} -cpu 1,2,4 -run=Test $@ ${TEST}
-+	${GOTEST:-go test} -timeout 3m ${COVER} ${RACE} -cpu 1,2,4 -run=Test $@ ${TEST}
- }
- 
- function integration_tests {
-@@ -69,16 +69,16 @@ function integration_tests {
- 		mv /tmp/etcd ./bin/etcd-last-release
- 	fi;
- 
--	go test -timeout 10m -v -cpu 1,2,4 $@ ${REPO_PATH}/e2e &
-+	${GOTEST:-go test} -timeout 10m -v -cpu 1,2,4 $@ ${REPO_PATH}/e2e &
- 	e2epid="$!"
--	go test -timeout 15m -v -cpu 1,2,4 $@ ${REPO_PATH}/integration &
-+	${GOTEST:-go test} -timeout 15m -v -cpu 1,2,4 $@ ${REPO_PATH}/integration &
- 	intpid="$!"
- 	wait $e2epid
- 	wait $intpid
--	go test -timeout 1m -v ${RACE} -cpu 1,2,4 $@ ${REPO_PATH}/client/integration
--	go test -timeout 10m -v ${RACE} -cpu 1,2,4 $@ ${REPO_PATH}/clientv3/integration
--	go test -timeout 1m -v -cpu 1,2,4 $@ ${REPO_PATH}/contrib/raftexample
--	go test -timeout 1m -v ${RACE} -cpu 1,2,4 -run=Example $@ ${TEST}
-+	${GOTEST:-go test} -timeout 1m -v ${RACE} -cpu 1,2,4 $@ ${REPO_PATH}/client/integration
-+	${GOTEST:-go test} -timeout 10m -v ${RACE} -cpu 1,2,4 $@ ${REPO_PATH}/clientv3/integration
-+	${GOTEST:-go test} -timeout 1m -v -cpu 1,2,4 $@ ${REPO_PATH}/contrib/raftexample
-+	${GOTEST:-go test} -timeout 1m -v ${RACE} -cpu 1,2,4 -run=Example $@ ${TEST}
- }
- 
- function fmt_tests {
-@@ -197,18 +197,18 @@ function dep_tests {
- }
- 
- # Set up gopath so tests use vendored dependencies
--export GOPATH=${PWD}/gopath
--rm -rf $GOPATH/src
--mkdir -p $GOPATH
--ln -s ${PWD}/cmd/vendor $GOPATH/src
-+#export GOPATH=${PWD}/Godeps/_workspace
-+#rm -rf $GOPATH/src
-+#mkdir -p $GOPATH
-+#ln -s ${PWD}/cmd/vendor $GOPATH/src
- 
- # fail fast on static tests
- toggle_failpoints disable
--fmt_tests
-+#fmt_tests
- dep_tests
- 
- # fail fast on static tests
--GO_BUILD_FLAGS="-a -v" etcd_build
-+#GO_BUILD_FLAGS="-a -v" etcd_build
- 
- unit_tests
- if [ -n "$INTEGRATION" ]; then
--- 
-1.9.3
-

run-etcd-on-ppc64le-by-default.patch

@@ -1,31 +0,0 @@
-From 5f8e74959f19f19018ab0e6400e0f5daba3567e5 Mon Sep 17 00:00:00 2001
-From: Jan Chaloupka <jchaloup@redhat.com>
-Date: Sat, 26 Nov 2016 13:46:29 +0100
-Subject: [PATCH] run etcd on ppc64le by default
-
----
- etcdmain/etcd.go | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go
-index 950513e..7225303 100644
---- a/etcdmain/etcd.go
-+++ b/etcdmain/etcd.go
-@@ -636,6 +636,14 @@ func checkSupportArch() {
- 	if runtime.GOARCH == "amd64" {
- 		return
- 	}
-+
-+	if runtime.GOARCH == "ppc64le" {
-+		plog.Warningf("Running etcd on ppc64le architecture is not supported.")
-+		plog.Warningf("Be aware you are running the etcd at your own risk.")
-+		plog.Warningf("For more information visit https://bugzilla.redhat.com/show_bug.cgi?id=1396463")
-+		return
-+	}
-+
- 	if env, ok := os.LookupEnv("ETCD_UNSUPPORTED_ARCH"); ok && env == runtime.GOARCH {
- 		plog.Warningf("running etcd on unsupported architecture %q since ETCD_UNSUPPORTED_ARCH is set", env)
- 		return
--- 
-1.9.3
-

sources

@@ -1,2 +1 @@
-SHA512 (etcd-3.2.16.tar.gz) = 5f3322b30266b0486310243d8f0c549d718687413e82fff27b26f195619a8e70ab5018921e02495f088ebe285559da76dcbfb9da0ef1f1d3c046ff90b8e4904c
-SHA512 (man-3.2.16.tar.gz) = 3bb97ea010fed98ea9297b2c4e9222559bff380e77df928c4a145757c9ce09c02ad06403d8e4a68e9f9a391ff3eb81deb77302668a8fb809b8f62ecf0c7bc283
+SHA512 (etcd-3.5.13.tar.gz) = dc85d80079b61e96eb06eb573d41d8972060392e49140a2414c283ea9edfef7b01d5554e50c7ab37c6ad079b373ae12a1b84dbcc533addc1d4d30a2a5abf7b7b

tests/tests.yml

@@ -1,3 +1,3 @@
 ---
 # Tests for classic environment
-- include: e2e_test_from_src_include.yml
+- import_playbook: e2e_test_from_src_include.yml