From c63f0854b5e596831cfc607cd0c8ea8d15d3aaaa Mon Sep 17 00:00:00 2001
From: Kaushal M <kshlmster@gmail.com>
Date: Wed, 28 Feb 2018 17:01:06 +0530
Subject: [PATCH 1/4] Update spec for 4.0.0

---
 extras/rpms/glusterd2.spec | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/extras/rpms/glusterd2.spec b/extras/rpms/glusterd2.spec
index 562ca94af..6c70abc4c 100644
--- a/extras/rpms/glusterd2.spec
+++ b/extras/rpms/glusterd2.spec
@@ -24,8 +24,8 @@
 %global gd2make %{__make} PREFIX=%{_prefix} EXEC_PREFIX=%{_exec_prefix} BINDIR=%{_bindir} SBINDIR=%{_sbindir} DATADIR=%{_datadir} LOCALSTATEDIR=%{_sharedstatedir} LOGDIR=%{_localstatedir}/log SYSCONFDIR=%{_sysconfdir} FASTBUILD=off
 
 Name: %{repo}
-Version: 4.0rc0
-Release: 2%{?dist}
+Version: 4.0.0
+Release: 1%{?dist}
 Summary: The GlusterFS management daemon (preview)
 License: GPLv2 or LGPLv3+
 URL: https://%{provider_prefix}
@@ -45,7 +45,7 @@ BuildRequires: golang(github.com/cespare/xxhash)
 BuildRequires: golang(github.com/cockroachdb/cmux)
 BuildRequires: golang(github.com/coreos/etcd/clientv3)
 BuildRequires: golang(github.com/coreos/etcd/clientv3/concurrency)
-#BuildRequires: golang(github.com/coreos/etcd/clientv3/namespace)
+BuildRequires: golang(github.com/coreos/etcd/clientv3/namespace)
 BuildRequires: golang(github.com/coreos/etcd/embed)
 BuildRequires: golang(github.com/coreos/etcd/etcdserver/etcdserverpb)
 BuildRequires: golang(github.com/coreos/etcd/pkg/transport)
@@ -70,7 +70,7 @@ BuildRequires: golang(golang.org/x/sys/unix)
 BuildRequires: golang(google.golang.org/grpc)
 %endif
 
-Requires: glusterfs-server >= 4.0rc0
+Requires: glusterfs-server >= 4.0.0
 %{?systemd_requires}
 
 %description
@@ -120,6 +120,9 @@ install -d -m 0755 %{buildroot}%{_localstatedir}/log/%{name}
 %{_sysconfdir}/bash_completion.d/glustercli.sh
 
 %changelog
+* Wed Feb 28 2018 Kaushal M <kshlmster@gmail.com> - 4.0.0
+- Update to v4.0.0
+
 * Wed Feb 14 2018 Kaushal M <kshlmster@gmail.com> - 4.0rc0-2
 - Update spec to support unbundled/vendored builds
 - Fedora defaults to bundled builds till all required dependencies are available

From 267b299c1c4f910c8b8eb416feb6c2212beb97b1 Mon Sep 17 00:00:00 2001
From: Kaushal M <kshlmster@gmail.com>
Date: Wed, 28 Feb 2018 17:02:23 +0530
Subject: [PATCH 2/4] Remove yaml/json config examples

---
 glusterd2.json.example | 5 -----
 glusterd2.yaml.example | 3 ---
 2 files changed, 8 deletions(-)
 delete mode 100644 glusterd2.json.example
 delete mode 100644 glusterd2.yaml.example

diff --git a/glusterd2.json.example b/glusterd2.json.example
deleted file mode 100644
index 0332433bd..000000000
--- a/glusterd2.json.example
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "localstatedir": "/var/lib/glusterd",
-  "peeraddress": ":24008",
-  "clientaddress":":24007"
-}
diff --git a/glusterd2.yaml.example b/glusterd2.yaml.example
deleted file mode 100644
index 36625cecc..000000000
--- a/glusterd2.yaml.example
+++ /dev/null
@@ -1,3 +0,0 @@
-localstatedir: "/var/lib/glusterd"
-peeraddress: ":24008"
-clientaddress: ":24007"

From 96f59c3db7e8c6fc4b38d589b7599acbc474cfb5 Mon Sep 17 00:00:00 2001
From: Kaushal M <kshlmster@gmail.com>
Date: Wed, 28 Feb 2018 17:04:48 +0530
Subject: [PATCH 3/4] Remove unused package from vendored list

---
 Gopkg.lock | 2 +-
 Gopkg.toml | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 8616f7f7e..f075348e7 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -462,6 +462,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "cfd248b9da41d80787e3411b951a08b6c9a22995ccbea69de7a35d27cda285c6"
+  inputs-digest = "19dda7f9b0c842a769bea1b5d69e3a41f5b7de536176724a9cdebc241dd0e96c"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index 3599a8f21..17bcc7356 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -86,10 +86,6 @@
   name = "google.golang.org/grpc"
   version = "^1.0.4"
 
-[[constraint]]
-  name = "gopkg.in/yaml.v2"
-  branch = "v2"
-
 [[constraint]]
   name = "github.com/asaskevich/govalidator"
   version = "v8"

From d3d382a3c31eec6a5dd9751f924f9b1d6bc1cfdf Mon Sep 17 00:00:00 2001
From: Kaushal M <kshlmster@gmail.com>
Date: Wed, 28 Feb 2018 20:06:27 +0530
Subject: [PATCH 4/4] Require /usr/bin/strings in specfile

---
 extras/rpms/glusterd2.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extras/rpms/glusterd2.spec b/extras/rpms/glusterd2.spec
index 6c70abc4c..f5a06afc5 100644
--- a/extras/rpms/glusterd2.spec
+++ b/extras/rpms/glusterd2.spec
@@ -71,6 +71,7 @@ BuildRequires: golang(google.golang.org/grpc)
 %endif
 
 Requires: glusterfs-server >= 4.0.0
+Requires: /usr/bin/strings
 %{?systemd_requires}
 
 %description