The package rpms/erlang-eleveldb.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-eleveldb.git/commit/?id=11....
Change:
-ExcludeArch: s390x
Thanks.
Full change:
============
commit 11b0a9b3c4e114f4fa99436b749d96cb7b575faa
Author: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Thu Jun 23 17:40:28 2022 +0200
eleveldb ver. 3.0.10
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
diff --git a/.gitignore b/.gitignore
index 8e6cee4..0f99fc8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@
/eleveldb-2.0.35.tar.gz
/basho-leveldb-2.0.36.tar.gz
/eleveldb-3.0.0.tar.gz
+/basho-leveldb-2.0.38.tar.gz
+/eleveldb-3.0.10.tar.gz
diff --git a/basho-leveldb-0002-Fix-least-byte-extraction.patch
b/basho-leveldb-0001-Fix-least-byte-extraction.patch
similarity index 100%
rename from basho-leveldb-0002-Fix-least-byte-extraction.patch
rename to basho-leveldb-0001-Fix-least-byte-extraction.patch
diff --git a/basho-leveldb-0001-Switch-from-cstdatomic-to-atomic.patch
b/basho-leveldb-0001-Switch-from-cstdatomic-to-atomic.patch
deleted file mode 100644
index 0809c7a..0000000
--- a/basho-leveldb-0001-Switch-from-cstdatomic-to-atomic.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan(a)danny.cz>
-Date: Fri, 3 Jun 2016 04:48:02 -0400
-Subject: [PATCH] Switch from <cstdatomic> to <atomic>
-
-Switch from <cstdatomic> to <atomic>. The former never made it into the
-standard and doesn't exist in modern gcc versions at all. The later contains
-everything that leveldb was using from the former.
-
-Backported from Google leveldb 1.18
-https://github.com/google/leveldb/commit/803d69203a62faf50f1b77897310a3a1fcae712b
-
-diff --git a/build_detect_platform b/build_detect_platform
-index 0f231fc..41247a9 100755
---- a/build_detect_platform
-+++ b/build_detect_platform
-@@ -156,11 +156,11 @@ if [ "$CROSS_COMPILE" = "true" ]; then
- else
- # If -std=c++0x works, use <cstdatomic>. Otherwise use port_posix.h.
- $CXX $CFLAGS -std=c++0x -x c++ - -o /dev/null 2>/dev/null <<EOF
-- #include <cstdatomic>
-+ #include <atomic>
- int main() {}
- EOF
- if [ "$?" = 0 ]; then
-- COMMON_FLAGS="$COMMON_FLAGS -DLEVELDB_PLATFORM_POSIX
-DLEVELDB_CSTDATOMIC_PRESENT"
-+ COMMON_FLAGS="$COMMON_FLAGS -DLEVELDB_PLATFORM_POSIX
-DLEVELDB_ATOMIC_PRESENT"
- PLATFORM_CXXFLAGS="-std=c++0x"
- else
- COMMON_FLAGS="$COMMON_FLAGS -DLEVELDB_PLATFORM_POSIX"
-diff --git a/port/atomic_pointer.h b/port/atomic_pointer.h
-index 2b485c7..18bd5be 100644
---- a/port/atomic_pointer.h
-+++ b/port/atomic_pointer.h
-@@ -20,9 +20,9 @@
- #define PORT_ATOMIC_POINTER_H_
-
- #include <stdint.h>
--//#ifdef LEVELDB_CSTDATOMIC_PRESENT
--//#include <cstdatomic> ... moved below
--//#endif
-+#ifdef LEVELDB_ATOMIC_PRESENT
-+#include <atomic>
-+#endif
- #ifdef OS_WIN
- #include <windows.h>
- #endif
-@@ -114,9 +114,8 @@ class AtomicPointer {
- }
- };
-
--// AtomicPointer based on <cstdatomic>
--#elif defined(LEVELDB_CSTDATOMIC_PRESENT)
--#include <cstdatomic>
-+// AtomicPointer based on <atomic>
-+#elif defined(LEVELDB_ATOMIC_PRESENT)
-
- class AtomicPointer {
- private:
diff --git a/erlang-eleveldb-0001-Use-system-wide-snappy.patch
b/erlang-eleveldb-0001-Use-system-wide-snappy.patch
index 612ed5f..4505b9f 100644
--- a/erlang-eleveldb-0001-Use-system-wide-snappy.patch
+++ b/erlang-eleveldb-0001-Use-system-wide-snappy.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use system-wide snappy
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
diff --git a/rebar.config b/rebar.config
-index 41d712b..3df5576 100644
+index 41d712b..9137cc2 100644
--- a/rebar.config
+++ b/rebar.config
@@ -23,14 +23,7 @@
@@ -17,8 +17,8 @@ index 41d712b..3df5576 100644
- {"CXXFLAGS", "$CXXFLAGS -Wall -O3 -fPIC"},
- {"DRV_CFLAGS", "$DRV_CFLAGS -O3 -Wall -I
c_src/leveldb/include -I c_src/leveldb -I c_src/system/include"},
- {"DRV_LDFLAGS", "$DRV_LDFLAGS c_src/leveldb/libleveldb.a
c_src/system/lib/libsnappy.a -lstdc++"}
-+ {"DRV_CFLAGS", "$DRV_CFLAGS -I leveldb-2.0.36/include -I
leveldb-2.0.36"},
-+ {"DRV_LDFLAGS", "$DRV_LDFLAGS leveldb-2.0.36/libleveldb.a
-lsnappy -lstdc++"}
++ {"DRV_CFLAGS", "$DRV_CFLAGS -I leveldb-2.0.38/include -I
leveldb-2.0.38"},
++ {"DRV_LDFLAGS", "$DRV_LDFLAGS leveldb-2.0.38/libleveldb.a
-lsnappy -lstdc++"}
]}.
-{pre_hooks, [{'get-deps', "c_src/build_deps.sh get-deps"},
diff --git a/erlang-eleveldb-0002-Don-t-treat-warnings-as-errors.patch
b/erlang-eleveldb-0002-Don-t-treat-warnings-as-errors.patch
index 8b925d5..f231272 100644
--- a/erlang-eleveldb-0002-Don-t-treat-warnings-as-errors.patch
+++ b/erlang-eleveldb-0002-Don-t-treat-warnings-as-errors.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't treat warnings as errors
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
diff --git a/rebar.config b/rebar.config
-index 3df5576..8014efa 100644
+index 9137cc2..3d0322f 100644
--- a/rebar.config
+++ b/rebar.config
@@ -20,7 +20,7 @@
@@ -16,4 +16,4 @@ index 3df5576..8014efa 100644
+{erl_opts, [debug_info]}.
{port_env, [
- {"DRV_CFLAGS", "$DRV_CFLAGS -I leveldb-2.0.36/include -I
leveldb-2.0.36"},
+ {"DRV_CFLAGS", "$DRV_CFLAGS -I leveldb-2.0.38/include -I
leveldb-2.0.38"},
diff --git a/erlang-eleveldb-0003-Disable-eqc-rebar3-plugin-for-now.patch
b/erlang-eleveldb-0003-Disable-eqc-rebar3-plugin-for-now.patch
index 865d717..c482ec7 100644
--- a/erlang-eleveldb-0003-Disable-eqc-rebar3-plugin-for-now.patch
+++ b/erlang-eleveldb-0003-Disable-eqc-rebar3-plugin-for-now.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Disable eqc rebar3 plugin for now
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
diff --git a/rebar.config b/rebar.config
-index 8014efa..b6a8e29 100644
+index 3d0322f..0c7a095 100644
--- a/rebar.config
+++ b/rebar.config
@@ -2,7 +2,7 @@
@@ -13,7 +13,7 @@ index 8014efa..b6a8e29 100644
{so_name, "eleveldb.so"}.
-{plugins, [{eqc_rebar, {git, "https://github.com/Quviq/eqc-rebar", {branch,
"master"}}}, pc]}.
-+{plugins, []}.
++{plugins, [pc]}.
{provider_hooks,
[
diff --git a/erlang-eleveldb.spec b/erlang-eleveldb.spec
index 90956af..e882d1b 100644
--- a/erlang-eleveldb.spec
+++ b/erlang-eleveldb.spec
@@ -3,7 +3,7 @@
Name: erlang-%{realname}
-Version: 3.0.0
+Version: 3.0.10
Epoch: 1
Release: 1%{?dist}
Summary: Erlang LevelDB API
@@ -11,15 +11,12 @@ 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/riak_kv-%{version}/%{r...
-Source1:
https://github.com/basho/leveldb/archive/2.0.36/basho-leveldb-2.0.36.tar.gz
+Source1:
https://github.com/basho/leveldb/archive/2.0.38/basho-leveldb-2.0.38.tar.gz
# Fedora/EPEL-specific
Patch1: erlang-eleveldb-0001-Use-system-wide-snappy.patch
Patch2: erlang-eleveldb-0002-Don-t-treat-warnings-as-errors.patch
Patch3: erlang-eleveldb-0003-Disable-eqc-rebar3-plugin-for-now.patch
-# switch to <atomic> from non-standard <cstdatomic>
-#
https://github.com/basho/leveldb/pull/194
-Patch101: basho-leveldb-0001-Switch-from-cstdatomic-to-atomic.patch
-Patch102: basho-leveldb-0002-Fix-least-byte-extraction.patch
+Patch101: basho-leveldb-0001-Fix-least-byte-extraction.patch
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: erlang-cuttlefish
@@ -31,7 +28,7 @@ BuildRequires: procps-ng
BuildRequires: snappy-devel
BuildRequires: make
# Remove when
https://bugzilla.redhat.com/show_bug.cgi?id=1770256 is resolved
-ExcludeArch: s390x
+#ExcludeArch: s390x
%description
@@ -46,16 +43,15 @@ rm -f c_src/snappy-1.0.4.tar.gz
%patch2 -p1 -b .no_warns_as_errors
%patch3 -p1 -b .disable_eqc
tar xvf %{SOURCE1}
-cd leveldb-2.0.36
-%patch101 -p1 -b .atomic
-%patch102 -p1 -b .fix_extraction
+cd leveldb-2.0.38
+%patch101 -p1 -b .fix_extraction
cd -
%build
# Building Basho's leveldb fork first
#cd leveldb-%{version}
-cd leveldb-2.0.36
+cd leveldb-2.0.38
OPT="%{optflags}" make
cd -
@@ -79,6 +75,9 @@ install -p -m 0644 priv/eleveldb_multi.schema
%{buildroot}%{erlang_appdir}/priv
%changelog
+* Thu Jun 23 2022 Peter Lemenkov <lemenkov(a)gmail.com> - 1:3.0.10-1
+- Ver. 3.0.10
+
* Fri Apr 8 2022 Peter Lemenkov <lemenkov(a)gmail.com> - 1:3.0.0-1
- Ver. 3.0.0
diff --git a/sources b/sources
index 0e2da4a..49e5b79 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (basho-leveldb-2.0.36.tar.gz) =
db70b9475f017c07038d928b0f50cda5847e9544b257c36612b80fd6aaf74e83f4eb2364dbd95b70d48fbdd57c760a6ad1feafe938a7015557cefd97aeee3aca
-SHA512 (eleveldb-3.0.0.tar.gz) =
334099db98447ccaaf35b4cebbb765fa012488a1a5ea023499e9c408dc956ed5a60145a6930d964a3fea7f300982ea9ed43eda31ab67f31aeb387b61ee98e449
+SHA512 (basho-leveldb-2.0.38.tar.gz) =
b9fc3a3f7aeb14b2d79ce8dac25f5da59332cf047706d3839bd6dc080cdfe1a8a83882b2e6e9d97d220826f96373301e87dd174522c7e952d1b440fda4b82a48
+SHA512 (eleveldb-3.0.10.tar.gz) =
5329240cfb791d64f282188ffb278c9262f821fb510d2c32b617d01a000e02d0fc6fe227b0de374d672cad102be9ec49ca9ba8f8fc1d614f5b84c943b6d750ed
commit 67e9728bddac3d0f2cc368625cdb7ff56b7a1bb7
Author: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Sat Apr 9 13:22:35 2022 +0200
eleveldb ver. 3.0.0
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
diff --git a/.gitignore b/.gitignore
index 63baeea..8e6cee4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@
/basho-leveldb-2.0.34.tar.gz
/eleveldb-2.0.34.tar.gz
/eleveldb-2.0.35.tar.gz
+/basho-leveldb-2.0.36.tar.gz
+/eleveldb-3.0.0.tar.gz
diff --git a/basho-leveldb-0001-Switch-from-cstdatomic-to-atomic.patch
b/basho-leveldb-0001-Switch-from-cstdatomic-to-atomic.patch
index ddaf604..0809c7a 100644
--- a/basho-leveldb-0001-Switch-from-cstdatomic-to-atomic.patch
+++ b/basho-leveldb-0001-Switch-from-cstdatomic-to-atomic.patch
@@ -10,7 +10,7 @@ Backported from Google leveldb 1.18
https://github.com/google/leveldb/commit/803d69203a62faf50f1b77897310a3a1...
diff --git a/build_detect_platform b/build_detect_platform
-index ddf313d..3dff2e4 100755
+index 0f231fc..41247a9 100755
--- a/build_detect_platform
+++ b/build_detect_platform
@@ -156,11 +156,11 @@ if [ "$CROSS_COMPILE" = "true" ]; then
diff --git a/basho-leveldb-0003-Fix-least-byte-extraction.patch
b/basho-leveldb-0002-Fix-least-byte-extraction.patch
similarity index 100%
rename from basho-leveldb-0003-Fix-least-byte-extraction.patch
rename to basho-leveldb-0002-Fix-least-byte-extraction.patch
diff --git a/basho-leveldb-0002-correct-code-in-the-32bit-path-to-correctly-compile.patch
b/basho-leveldb-0002-correct-code-in-the-32bit-path-to-correctly-compile.patch
deleted file mode 100644
index 91e3ec7..0000000
--- a/basho-leveldb-0002-correct-code-in-the-32bit-path-to-correctly-compile.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: MatthewVon <matthewv(a)basho.com>
-Date: Thu, 19 Jan 2017 15:13:04 -0500
-Subject: [PATCH] correct code in the 32bit path to correctly compile
-
-
-diff --git a/util/perf_count.cc b/util/perf_count.cc
-index ac6aaa2..8b1a241 100644
---- a/util/perf_count.cc
-+++ b/util/perf_count.cc
-@@ -360,11 +360,11 @@ PerformanceCounters * gPerfCounters(&LocalStartupCounters);
- uint32_t ret_32, * ptr_32;
-
- ptr_32=(uint32_t *)&val_ptr;
-- ret_32=inc_and_fetch(ptr_32, 1);
-+ ret_32=inc_and_fetch(ptr_32);
- if (0==ret_32)
- {
- ++ptr_32;
-- inc_and_fetch(ptr_32, 1);
-+ inc_and_fetch(ptr_32);
- } // if
- #endif
- ret_val=*val_ptr;
-@@ -432,11 +432,11 @@ PerformanceCounters * gPerfCounters(&LocalStartupCounters);
-
- ptr_32=(uint32_t *)&val_ptr;
- old_32=*ptr_32;
-- ret_32=add_and_fetch(ptr_32, Amount);
-+ ret_32=add_and_fetch(ptr_32, (uint32_t)Amount);
- if (ret_32<old_32)
- {
- ++ptr_32;
-- add_and_fetch(ptr_32, 1);
-+ add_and_fetch(ptr_32, (uint32_t)1);
- } // if
-
- ret_val=*val_ptr;
diff --git a/erlang-eleveldb-0001-Use-system-wide-snappy.patch
b/erlang-eleveldb-0001-Use-system-wide-snappy.patch
index aa8b563..612ed5f 100644
--- a/erlang-eleveldb-0001-Use-system-wide-snappy.patch
+++ b/erlang-eleveldb-0001-Use-system-wide-snappy.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Use system-wide snappy
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
diff --git a/rebar.config b/rebar.config
-index c16e5f3..18e7d4d 100644
+index 41d712b..3df5576 100644
--- a/rebar.config
+++ b/rebar.config
-@@ -18,14 +18,7 @@
- % #!sed ]}.
+@@ -23,14 +23,7 @@
+ {erl_opts, [warnings_as_errors, debug_info]}.
{port_env, [
- %% Make sure to set -fPIC when compiling leveldb
@@ -17,8 +17,8 @@ index c16e5f3..18e7d4d 100644
- {"CXXFLAGS", "$CXXFLAGS -Wall -O3 -fPIC"},
- {"DRV_CFLAGS", "$DRV_CFLAGS -O3 -Wall -I
c_src/leveldb/include -I c_src/leveldb -I c_src/system/include"},
- {"DRV_LDFLAGS", "$DRV_LDFLAGS c_src/leveldb/libleveldb.a
c_src/system/lib/libsnappy.a -lstdc++"}
-+ {"DRV_CFLAGS", "$DRV_CFLAGS -I leveldb-2.0.34/include -I
leveldb-2.0.34"},
-+ {"DRV_LDFLAGS", "$DRV_LDFLAGS leveldb-2.0.34/libleveldb.a
-lsnappy -lstdc++"}
++ {"DRV_CFLAGS", "$DRV_CFLAGS -I leveldb-2.0.36/include -I
leveldb-2.0.36"},
++ {"DRV_LDFLAGS", "$DRV_LDFLAGS leveldb-2.0.36/libleveldb.a
-lsnappy -lstdc++"}
]}.
-{pre_hooks, [{'get-deps', "c_src/build_deps.sh get-deps"},
diff --git a/erlang-eleveldb-0005-Don-t-treat-warnings-as-errors.patch
b/erlang-eleveldb-0002-Don-t-treat-warnings-as-errors.patch
similarity index 71%
rename from erlang-eleveldb-0005-Don-t-treat-warnings-as-errors.patch
rename to erlang-eleveldb-0002-Don-t-treat-warnings-as-errors.patch
index 1dbbcbd..8b925d5 100644
--- a/erlang-eleveldb-0005-Don-t-treat-warnings-as-errors.patch
+++ b/erlang-eleveldb-0002-Don-t-treat-warnings-as-errors.patch
@@ -5,15 +5,15 @@ Subject: [PATCH] Don't treat warnings as errors
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
diff --git a/rebar.config b/rebar.config
-index 18e7d4d..fdcbb75 100644
+index 3df5576..8014efa 100644
--- a/rebar.config
+++ b/rebar.config
-@@ -6,7 +6,7 @@
+@@ -20,7 +20,7 @@
{port_sources, ["c_src/*.cc"]}.
-{erl_opts, [warnings_as_errors, debug_info]}.
+{erl_opts, [debug_info]}.
- %%
- %% The following 3 lines are only activated during builbot
+ {port_env, [
+ {"DRV_CFLAGS", "$DRV_CFLAGS -I leveldb-2.0.36/include -I
leveldb-2.0.36"},
diff --git
a/erlang-eleveldb-0002-Fix-deprecation-warning-while-building-with-Erlang-1.patch
b/erlang-eleveldb-0002-Fix-deprecation-warning-while-building-with-Erlang-1.patch
deleted file mode 100644
index 456554b..0000000
--- a/erlang-eleveldb-0002-Fix-deprecation-warning-while-building-with-Erlang-1.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From: Peter Lemenkov <lemenkov(a)gmail.com>
-Date: Tue, 16 Aug 2016 18:20:31 +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/test/rand_gen_1.erl b/test/rand_gen_1.erl
-index 3741060..646b294 100644
---- a/test/rand_gen_1.erl
-+++ b/test/rand_gen_1.erl
-@@ -15,9 +15,9 @@
-
- random_bin(_Id, Size) ->
- HunkSize = 16*1024*1024,
-- BigHunk = crypto:rand_bytes(HunkSize),
-+ BigHunk = crypto:strong_rand_bytes(HunkSize),
- fun() ->
-- Offset = random:uniform(HunkSize - Size),
-+ Offset = rand:uniform(HunkSize - Size),
- <<_:Offset/binary, Bin:Size/binary, _/binary>> = BigHunk,
- Bin
- end.
-@@ -32,11 +32,11 @@ almost_completely_sequential(_Id, MaxSuffix, PercentAlmostSeq) ->
- fun() ->
- {A, B, C} = os:timestamp(),
- TimeT = (A*1000000) + B,
-- End = case random:uniform(100) of
-+ End = case rand:uniform(100) of
- N when N < PercentAlmostSeq ->
- C; % microseconds
- _ ->
-- random:uniform(MaxSuffix)
-+ rand:uniform(MaxSuffix)
- end,
- [integer_to_list(TimeT), $_,
- integer_to_list(End)]
-@@ -54,7 +54,7 @@ almost_completely_sequential(_Id, MaxSuffix, PercentAlmostSeq) ->
- %% still have the same "integer1_integer2" form, but the first integer
- %% will up to approximately 3 million seconds earlier than the current
- %% time_t wall clock time, and the second integer will be generated by
--%% random:uniform(1000*1000).
-+%% rand:uniform(1000*1000).
- %%
- %% As MillionNotSequential approaches zero, the keys generated will
- %% become more and more perfectly sorted.
-@@ -62,11 +62,11 @@ almost_completely_sequential(_Id, MaxSuffix, PercentAlmostSeq) ->
- mostly_sequential(_Id, MillionNotSequential) ->
- fun() ->
- {A, B, C} = os:timestamp(),
-- {X, Y, Z} = case random:uniform(1000*1000) of
-+ {X, Y, Z} = case rand:uniform(1000*1000) of
- N when N < MillionNotSequential ->
-- {A - random:uniform(3),
-- abs(B - random:uniform(500*1000)),
-- random:uniform(1000*1000)};
-+ {A - rand:uniform(3),
-+ abs(B - rand:uniform(500*1000)),
-+ rand:uniform(1000*1000)};
- _ ->
- {A, B, C}
- end,
-@@ -89,7 +89,7 @@ pareto(Mean, Shape) ->
- S1 = (-1 / Shape),
- S2 = Mean * (Shape - 1),
- fun() ->
-- U = 1 - random:uniform(),
-+ U = 1 - rand:uniform(),
- trunc((math:pow(U, S1) - 1) * S2)
- end.
-
diff --git a/erlang-eleveldb-0003-Disable-eqc-rebar3-plugin-for-now.patch
b/erlang-eleveldb-0003-Disable-eqc-rebar3-plugin-for-now.patch
new file mode 100644
index 0000000..865d717
--- /dev/null
+++ b/erlang-eleveldb-0003-Disable-eqc-rebar3-plugin-for-now.patch
@@ -0,0 +1,19 @@
+From: Peter Lemenkov <lemenkov(a)gmail.com>
+Date: Fri, 8 Apr 2022 00:19:50 +0200
+Subject: [PATCH] Disable eqc rebar3 plugin for now
+
+Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
+
+diff --git a/rebar.config b/rebar.config
+index 8014efa..b6a8e29 100644
+--- a/rebar.config
++++ b/rebar.config
+@@ -2,7 +2,7 @@
+ {eunit_opts, [verbose]}.
+ {so_name, "eleveldb.so"}.
+
+-{plugins, [{eqc_rebar, {git, "https://github.com/Quviq/eqc-rebar", {branch,
"master"}}}, pc]}.
++{plugins, []}.
+
+ {provider_hooks,
+ [
diff --git a/erlang-eleveldb.spec b/erlang-eleveldb.spec
index 0191d68..90956af 100644
--- a/erlang-eleveldb.spec
+++ b/erlang-eleveldb.spec
@@ -3,26 +3,23 @@
Name: erlang-%{realname}
-Version: 2.0.35
+Version: 3.0.0
Epoch: 1
-Release: 12%{?dist}
+Release: 1%{?dist}
Summary: Erlang LevelDB API
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}...
-#Source1:
https://github.com/basho/leveldb/archive/%{version}/basho-leveldb-%{versi...
-Source1:
https://github.com/basho/leveldb/archive/%{version}/basho-leveldb-2.0.34....
+Source0:
https://github.com/%{upstream}/%{realname}/archive/riak_kv-%{version}/%{r...
+Source1:
https://github.com/basho/leveldb/archive/2.0.36/basho-leveldb-2.0.36.tar.gz
# Fedora/EPEL-specific
Patch1: erlang-eleveldb-0001-Use-system-wide-snappy.patch
-Patch2: erlang-eleveldb-0002-Fix-deprecation-warning-while-building-with-Erlang-1.patch
-Patch5: erlang-eleveldb-0005-Don-t-treat-warnings-as-errors.patch
+Patch2: erlang-eleveldb-0002-Don-t-treat-warnings-as-errors.patch
+Patch3: erlang-eleveldb-0003-Disable-eqc-rebar3-plugin-for-now.patch
# switch to <atomic> from non-standard <cstdatomic>
#
https://github.com/basho/leveldb/pull/194
Patch101: basho-leveldb-0001-Switch-from-cstdatomic-to-atomic.patch
-#
https://github.com/basho/leveldb/pull/220
-Patch102: basho-leveldb-0002-correct-code-in-the-32bit-path-to-correctly-compile.patch
-Patch103: basho-leveldb-0003-Fix-least-byte-extraction.patch
+Patch102: basho-leveldb-0002-Fix-least-byte-extraction.patch
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: erlang-cuttlefish
@@ -42,25 +39,23 @@ Erlang LevelDB API.
%prep
-%setup -q -n %{realname}-%{version}
+%setup -q -n %{realname}-riak_kv-%{version}
rm -f c_src/build_deps.sh
rm -f c_src/snappy-1.0.4.tar.gz
%patch1 -p1 -b .use_systemwide
-%patch2 -p1 -b .fix_deprecation_warnings
-%patch5 -p1 -b .no_warns_as_errors
+%patch2 -p1 -b .no_warns_as_errors
+%patch3 -p1 -b .disable_eqc
tar xvf %{SOURCE1}
-#cd leveldb-%{version}
-cd leveldb-2.0.34
+cd leveldb-2.0.36
%patch101 -p1 -b .atomic
-%patch102 -p1 -b .32_bit
-%patch103 -p1 -b .fix_extraction
+%patch102 -p1 -b .fix_extraction
cd -
%build
# Building Basho's leveldb fork first
#cd leveldb-%{version}
-cd leveldb-2.0.34
+cd leveldb-2.0.36
OPT="%{optflags}" make
cd -
@@ -84,6 +79,9 @@ install -p -m 0644 priv/eleveldb_multi.schema
%{buildroot}%{erlang_appdir}/priv
%changelog
+* Fri Apr 8 2022 Peter Lemenkov <lemenkov(a)gmail.com> - 1:3.0.0-1
+- Ver. 3.0.0
+
* Tue Feb 1 2022 Peter Lemenkov <lemenkov(a)gmail.com> - 1:2.0.35-12
- Rebuild for Erlang 24
diff --git a/sources b/sources
index 0b61bc3..0e2da4a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (basho-leveldb-2.0.34.tar.gz) =
5b0286f6295cd723e3fa3bfe5e17bfae6ea1c3a21bd0e5c93cb4327e461c8d382f7d62efad42c08aaeb253132a484ddf01270467db6d605246278b5e802a2e3e
-SHA512 (eleveldb-2.0.35.tar.gz) =
755c0bad5d6f46a569fbe531a6f9e555f7d3cd1c6857ca4ca157d33f23fbbafb644dbfa6423846554e2ab8782030f7f4a5ebdb5dd452ded3948d0bfefbe75885
+SHA512 (basho-leveldb-2.0.36.tar.gz) =
db70b9475f017c07038d928b0f50cda5847e9544b257c36612b80fd6aaf74e83f4eb2364dbd95b70d48fbdd57c760a6ad1feafe938a7015557cefd97aeee3aca
+SHA512 (eleveldb-3.0.0.tar.gz) =
334099db98447ccaaf35b4cebbb765fa012488a1a5ea023499e9c408dc956ed5a60145a6930d964a3fea7f300982ea9ed43eda31ab67f31aeb387b61ee98e449