Skip to content
This repository has been archived by the owner on Mar 26, 2020. It is now read-only.

Commit

Permalink
Merge pull request #590 from kshlm/prepare-for-4.0.0
Browse files Browse the repository at this point in the history
Prepare for 4.0.0
  • Loading branch information
kshlm authored Mar 1, 2018
2 parents 9f08c39 + d3d382a commit 3d123bd
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 17 deletions.
2 changes: 1 addition & 1 deletion Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
12 changes: 8 additions & 4 deletions extras/rpms/glusterd2.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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)
Expand All @@ -70,7 +70,8 @@ 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
Requires: /usr/bin/strings
%{?systemd_requires}

%description
Expand Down Expand Up @@ -120,6 +121,9 @@ install -d -m 0755 %{buildroot}%{_localstatedir}/log/%{name}
%{_sysconfdir}/bash_completion.d/glustercli.sh

%changelog
* Wed Feb 28 2018 Kaushal M <[email protected]> - 4.0.0
- Update to v4.0.0

* Wed Feb 14 2018 Kaushal M <[email protected]> - 4.0rc0-2
- Update spec to support unbundled/vendored builds
- Fedora defaults to bundled builds till all required dependencies are available
Expand Down
5 changes: 0 additions & 5 deletions glusterd2.json.example

This file was deleted.

3 changes: 0 additions & 3 deletions glusterd2.yaml.example

This file was deleted.

0 comments on commit 3d123bd

Please sign in to comment.