The package rpms/erlang-riak_ensemble.git has added or updated architecture specific
content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/erlang-riak_ensemble.git/commit/?....
Change:
-ExcludeArch: s390x
Thanks.
Full change:
============
commit a2417f030f9f4e40091553161d42843258fd6dd8
Author: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Thu Jun 23 18:06:02 2022 +0200
riak_ensemble ver. 3.0.10
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
diff --git a/.gitignore b/.gitignore
index 3a98e2f..662399c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/riak_ensemble-2.1.8.tar.gz
/riak_ensemble-2.1.9.tar.gz
/riak_ensemble-3.0.0.tar.gz
+/riak_ensemble-3.0.10.tar.gz
diff --git a/erlang-riak_ensemble-0001-Disable-rebar3-plugins-for-now.patch
b/erlang-riak_ensemble-0001-Disable-rebar3-plugins-for-now.patch
index 3a629bb..4e7c421 100644
--- a/erlang-riak_ensemble-0001-Disable-rebar3-plugins-for-now.patch
+++ b/erlang-riak_ensemble-0001-Disable-rebar3-plugins-for-now.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Disable rebar3 plugins for now
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
diff --git a/rebar.config b/rebar.config
-index e45d41d..c50286f 100644
+index 0e60bd1..0b51672 100644
--- a/rebar.config
+++ b/rebar.config
@@ -13,13 +13,10 @@
- {eleveldb, {git, "git://github.com/basho/eleveldb.git", {tag,
"riak_kv-3.0.0"}}}
+ {eleveldb, {git, "git://github.com/basho/eleveldb.git", {tag,
"riak_kv-3.0.10"}}}
]}.
-{plugins, [{eqc_rebar, {git, "https://github.com/Quviq/eqc-rebar", {branch,
"master"}}}, pc]}.
diff --git a/erlang-riak_ensemble.spec b/erlang-riak_ensemble.spec
index 4276e4c..33cb9f6 100644
--- a/erlang-riak_ensemble.spec
+++ b/erlang-riak_ensemble.spec
@@ -3,7 +3,7 @@
Name: erlang-%{realname}
-Version: 3.0.0
+Version: 3.0.10
Release: 1%{?dist}
Summary: Multi-Paxos framework in Erlang
License: ASL 2.0
@@ -16,7 +16,7 @@ BuildRequires: erlang-lager
BuildRequires: erlang-rebar3
BuildRequires: gcc
# Remove when
https://bugzilla.redhat.com/show_bug.cgi?id=1770256 is resolved
-ExcludeArch: s390x
+#ExcludeArch: s390x
%description
@@ -58,6 +58,9 @@ gcc $LDFLAGS -shared -L%{_libdir}/erlang/usr/lib -lei
c_src/riak_ensemble_clock.
%changelog
+* Thu Jun 23 2022 Peter Lemenkov <lemenkov(a)gmail.com> - 3.0.10-1
+- Ver. 3.0.10
+
* Thu Apr 7 2022 Peter Lemenkov <lemenkov(a)gmail.com> - 3.0.0-1
- Ver. 3.0.0
- Switch to rebar3
diff --git a/sources b/sources
index 3205963..f04d624 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (riak_ensemble-3.0.0.tar.gz) =
7b3833a539b957fc2194db89f5190171bc52c2114c96fbfee70e040449115bf8ceb191c43e6030e58e29fb68358ebadd338b815f48dc9d02c498757d503efe56
+SHA512 (riak_ensemble-3.0.10.tar.gz) =
bfaae9b6e8f29a2411f5d8ff4d4f0bc680e992113c71ce17c3e814e7009825d5397c6600e4466cfc5f2b1282a905f57ccdda55307e7fc76a28b3b754c4c6cff7
commit 2cfff99f99e7371449629072c28be13b772e1e8f
Author: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Sat Apr 9 19:04:47 2022 +0200
Upload sources
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
diff --git a/.gitignore b/.gitignore
index 5b790bb..3a98e2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/riak_ensemble-2.1.2.tar.gz
/riak_ensemble-2.1.8.tar.gz
/riak_ensemble-2.1.9.tar.gz
+/riak_ensemble-3.0.0.tar.gz
diff --git a/erlang-riak_ensemble-0001-Disable-rebar3-plugins-for-now.patch
b/erlang-riak_ensemble-0001-Disable-rebar3-plugins-for-now.patch
new file mode 100644
index 0000000..3a629bb
--- /dev/null
+++ b/erlang-riak_ensemble-0001-Disable-rebar3-plugins-for-now.patch
@@ -0,0 +1,24 @@
+From: Peter Lemenkov <lemenkov(a)gmail.com>
+Date: Thu, 7 Apr 2022 23:49:24 +0200
+Subject: [PATCH] Disable rebar3 plugins for now
+
+Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
+
+diff --git a/rebar.config b/rebar.config
+index e45d41d..c50286f 100644
+--- a/rebar.config
++++ b/rebar.config
+@@ -13,13 +13,10 @@
+ {eleveldb, {git, "git://github.com/basho/eleveldb.git", {tag,
"riak_kv-3.0.0"}}}
+ ]}.
+
+-{plugins, [{eqc_rebar, {git, "https://github.com/Quviq/eqc-rebar", {branch,
"master"}}}, pc]}.
+ {provider_hooks,
+ [
+ {pre,
+ [
+- {compile, {pc, compile}},
+- {clean, {pc, clean}}
+ ]
+ }
+ ]
diff --git a/erlang-riak_ensemble-0001-Remove-deprecated-BIF.patch
b/erlang-riak_ensemble-0001-Remove-deprecated-BIF.patch
deleted file mode 100644
index b4fd547..0000000
--- a/erlang-riak_ensemble-0001-Remove-deprecated-BIF.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Peter Lemenkov <lemenkov(a)gmail.com>
-Date: Fri, 22 Apr 2016 13:57:32 +0300
-Subject: [PATCH] Remove deprecated BIF
-
-Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
-
-diff --git a/src/riak_ensemble_manager.erl b/src/riak_ensemble_manager.erl
-index f0a1085..4cbb7ce 100644
---- a/src/riak_ensemble_manager.erl
-+++ b/src/riak_ensemble_manager.erl
-@@ -487,7 +487,7 @@ reload_state() ->
- -spec initial_state() -> state().
- initial_state() ->
- ets:insert(?ETS, {enabled, false}),
-- ClusterName = {node(), erlang:now()},
-+ ClusterName = {node(), os:timestamp()},
- CS = riak_ensemble_state:new(ClusterName),
- State=#state{version=0,
- ensemble_data=[],
-diff --git a/src/synctree_leveldb.erl b/src/synctree_leveldb.erl
-index 69d005d..0deeef9 100644
---- a/src/synctree_leveldb.erl
-+++ b/src/synctree_leveldb.erl
-@@ -87,7 +87,7 @@ get_path(Opts) ->
- case proplists:get_value(path, Opts) of
- undefined ->
- Base = "/tmp/ST",
-- Name = integer_to_list(timestamp(erlang:now())),
-+ Name = integer_to_list(timestamp(os:timestamp())),
- filename:join(Base, Name);
- Path ->
- Path
diff --git
a/erlang-riak_ensemble-0002-Fix-deprecation-warning-while-building-with-Erlang-1.patch
b/erlang-riak_ensemble-0002-Fix-deprecation-warning-while-building-with-Erlang-1.patch
deleted file mode 100644
index 964cbcb..0000000
---
a/erlang-riak_ensemble-0002-Fix-deprecation-warning-while-building-with-Erlang-1.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From: Peter Lemenkov <lemenkov(a)gmail.com>
-Date: Wed, 17 Aug 2016 15:51:15 +0300
-Subject: [PATCH] Fix deprecation warning while building with Erlang 19
-
-The following functions are considered deprecated:
-
-- crypto:rand_bytes/1
-- random:seed/1
-- random:uniform/1
-
-Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
-
-diff --git a/src/riak_ensemble_config.erl b/src/riak_ensemble_config.erl
-index 7d4aa3d..a24a08a 100644
---- a/src/riak_ensemble_config.erl
-+++ b/src/riak_ensemble_config.erl
-@@ -51,7 +51,7 @@ follower_timeout() ->
- %% The election timeout used for randomized election.
- election_timeout() ->
- Timeout = follower_timeout(),
-- Timeout + random:uniform(Timeout).
-+ Timeout + rand:uniform(Timeout).
-
- %% @doc
- %% The prefollow timeout determines how long a peer waits to hear from the
-diff --git a/src/riak_ensemble_peer.erl b/src/riak_ensemble_peer.erl
-index 5166413..54906a0 100644
---- a/src/riak_ensemble_peer.erl
-+++ b/src/riak_ensemble_peer.erl
-@@ -1818,9 +1818,9 @@ get_value(Obj, Default, State) ->
- init([Mod, Ensemble, Id, Args]) ->
- lager:debug("~p: starting peer", [Id]),
- {A,B,C} = os:timestamp(),
-- _ = random:seed(A + erlang:phash2(Id),
-+ _ = rand:seed(exsplus, {A + erlang:phash2(Id),
- B + erlang:phash2(node()),
-- C),
-+ C}),
- ETS = ets:new(x, [public, {read_concurrency, true}, {write_concurrency, true}]),
- TreeTrust = case riak_ensemble_config:tree_validation() of
- false ->
-diff --git a/src/riak_ensemble_util.erl b/src/riak_ensemble_util.erl
-index e2e5abd..17204ed 100644
---- a/src/riak_ensemble_util.erl
-+++ b/src/riak_ensemble_util.erl
-@@ -148,7 +148,7 @@ shuffle(L=[_]) ->
- L;
- shuffle(L) ->
- Range = length(L),
-- L2 = [{random:uniform(Range), E} || E <- L],
-+ L2 = [{rand:uniform(Range), E} || E <- L],
- [E || {_, E} <- lists:sort(L2)].
-
- %% Copied from riak_core_send_msg.erl
diff --git a/erlang-riak_ensemble-0003-Don-t-treat-warns-as-errors.patch
b/erlang-riak_ensemble-0003-Don-t-treat-warns-as-errors.patch
deleted file mode 100644
index f6c75a1..0000000
--- a/erlang-riak_ensemble-0003-Don-t-treat-warns-as-errors.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Peter Lemenkov <lemenkov(a)gmail.com>
-Date: Tue, 6 Mar 2018 18:51:40 +0300
-Subject: [PATCH] Don't treat warns as errors
-
-Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
-
-diff --git a/rebar.config b/rebar.config
-index 471fb49..82d337e 100644
---- a/rebar.config
-+++ b/rebar.config
-@@ -1,5 +1,4 @@
- {erl_opts, [debug_info,
-- warnings_as_errors,
- warn_untyped_record,
- {platform_define, "^[0-9]+", namespaced_types},
- {parse_transform, lager_transform}]}.
-diff --git a/rebar.test.config b/rebar.test.config
-index 5860da2..577f6bc 100644
---- a/rebar.test.config
-+++ b/rebar.test.config
-@@ -1,5 +1,4 @@
- {erl_opts, [debug_info,
-- warnings_as_errors,
- warn_untyped_record,
- {parse_transform, lager_transform}]}.
- {eunit_opts, [verbose]}.
diff --git a/sources b/sources
index 7b336c4..3205963 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (riak_ensemble-2.1.9.tar.gz) =
1d46818e493477dcd92b3601b51055baf018e4be947b498dd8fcd965ea138e99ce4cea1a1ca6fe43bf9aa912ec7e33614885c418c2a9a5b631a74094ae964fb8
+SHA512 (riak_ensemble-3.0.0.tar.gz) =
7b3833a539b957fc2194db89f5190171bc52c2114c96fbfee70e040449115bf8ceb191c43e6030e58e29fb68358ebadd338b815f48dc9d02c498757d503efe56
commit 07e4caf76c89588671190f559c56f6d0644dad4a
Author: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Sat Apr 9 18:55:06 2022 +0200
riak_ensemble ver. 3.0.0
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
diff --git a/erlang-riak_ensemble.spec b/erlang-riak_ensemble.spec
index 41f4053..4276e4c 100644
--- a/erlang-riak_ensemble.spec
+++ b/erlang-riak_ensemble.spec
@@ -3,21 +3,18 @@
Name: erlang-%{realname}
-Version: 2.1.9
-Release: 11%{?dist}
+Version: 3.0.0
+Release: 1%{?dist}
Summary: Multi-Paxos framework in Erlang
License: ASL 2.0
URL:
https://github.com/%{upstream}/%{realname}
VCS:
scm:git:https://github.com/%{upstream}/%{realname}.git
-Source0:
https://github.com/%{upstream}/%{realname}/archive/%{version}/%{realname}...
-Patch1: erlang-riak_ensemble-0001-Remove-deprecated-BIF.patch
-Patch2: erlang-riak_ensemble-0002-Fix-deprecation-warning-while-building-with-Erlang-1.patch
-Patch3: erlang-riak_ensemble-0003-Don-t-treat-warns-as-errors.patch
-BuildRequires: gcc
+Source0:
https://github.com/%{upstream}/%{realname}/archive/riak_kv-%{version}/%{r...
+Patch1: erlang-riak_ensemble-0001-Disable-rebar3-plugins-for-now.patch
BuildRequires: erlang-eleveldb
BuildRequires: erlang-lager
-BuildRequires: erlang-rebar
-#BuildRequires: erlang-riak_test
+BuildRequires: erlang-rebar3
+BuildRequires: gcc
# Remove when
https://bugzilla.redhat.com/show_bug.cgi?id=1770256 is resolved
ExcludeArch: s390x
@@ -35,19 +32,23 @@ combination of per-key and per-ensemble state.
%prep
-%autosetup -p1 -n %{realname}-%{version}
+%autosetup -p1 -n %{realname}-riak_kv-%{version}
%build
-%{erlang_compile}
+%{erlang3_compile}
+# FIXME we don't have a port compiler plugin for rebar3 yet
+mkdir -p priv
+gcc $CFLAGS -c -I%{_libdir}/erlang/usr/include c_src/riak_ensemble_clock.c -o
c_src/riak_ensemble_clock.o
+gcc $LDFLAGS -shared -L%{_libdir}/erlang/usr/lib -lei c_src/riak_ensemble_clock.o -o
priv/riak_ensemble.so
%install
-%{erlang_install}
+%{erlang3_install}
%check
-#%%{erlang_test}
+%{erlang3_test}
%files
@@ -57,6 +58,11 @@ combination of per-key and per-ensemble state.
%changelog
+* Thu Apr 7 2022 Peter Lemenkov <lemenkov(a)gmail.com> - 3.0.0-1
+- Ver. 3.0.0
+- Switch to rebar3
+- Enable tests
+
* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.9-11
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
commit 585c64f4426671839de9f995caf4819e703c90ff
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jan 20 02:21:18 2022 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/erlang-riak_ensemble.spec b/erlang-riak_ensemble.spec
index 45319d3..41f4053 100644
--- a/erlang-riak_ensemble.spec
+++ b/erlang-riak_ensemble.spec
@@ -4,7 +4,7 @@
Name: erlang-%{realname}
Version: 2.1.9
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Multi-Paxos framework in Erlang
License: ASL 2.0
URL:
https://github.com/%{upstream}/%{realname}
@@ -57,6 +57,9 @@ combination of per-key and per-ensemble state.
%changelog
+* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.9-11
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.9-10
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild