diff --git a/.gitignore b/.gitignore index c900cec..278682f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /basho-riak_kv-1.1.2-0-gc732840.tar.gz /basho-riak_kv-1.1.4-0-g18643de.tar.gz +/basho-riak_kv-1.2.1p2-0-g7912e86.tar.gz diff --git a/erlang-riak_kv-0001-Don-t-check-for-deps-Fedora-EPEL-specific.patch b/erlang-riak_kv-0001-Don-t-check-for-deps-Fedora-EPEL-specific.patch index 957ec01..79aa549 100644 --- a/erlang-riak_kv-0001-Don-t-check-for-deps-Fedora-EPEL-specific.patch +++ b/erlang-riak_kv-0001-Don-t-check-for-deps-Fedora-EPEL-specific.patch @@ -1,41 +1,38 @@ -From cd571a1665c497a577b129c332612abdd63cce24 Mon Sep 17 00:00:00 2001 +From e926cbc93b6b3b722df54e31dc023ec9ca89a8a1 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 27 Nov 2010 20:05:09 +0300 Subject: [PATCH 1/6] Don't check for deps (Fedora/EPEL specific) Signed-off-by: Peter Lemenkov --- - rebar.config | 20 -------------------- - 1 file changed, 20 deletions(-) + rebar.config | 17 ----------------- + 1 file changed, 17 deletions(-) diff --git a/rebar.config b/rebar.config -index 137f228..9a009c0 100644 +index 607c49a..144bdec 100644 --- a/rebar.config +++ b/rebar.config -@@ -7,23 +7,3 @@ +@@ -7,20 +7,3 @@ "src/riak_kv_backend.erl", "src/riak_index_backend.erl" ]}. - -{deps, [ -- {riak_core, "1.1.2", {git, "git://github.com/basho/riak_core", {tag, "1.1.2"}}}, -- {riakc, "1.2.1", {git, "git://github.com/basho/riak-erlang-client", -- {tag, "1.2.1"}}}, +- {riak_core, "1.2.*", {git, "git://github.com/basho/riak_core", {tag, "1.2.1p1"}}}, - {luke, "0.2.5", {git, "git://github.com/basho/luke", {tag, "0.2.5"}}}, -- {erlang_js, "1.0.2", {git, "git://github.com/basho/erlang_js", {tag, "1.0.2"}}}, -- {bitcask, "1.5.1", {git, "git://github.com/basho/bitcask", {tag, "1.5.1"}}}, -- {merge_index, "1.1.0", {git, "git://github.com/basho/merge_index", -- {tag, "1.1.0"}}}, +- {erlang_js, "1.2.1", {git, "git://github.com/basho/erlang_js", {tag, "1.2.1"}}}, +- {bitcask, "1.5.2", {git, "git://github.com/basho/bitcask", {tag, "1.5.2"}}}, +- {merge_index, "1.2.*", {git, "git://github.com/basho/merge_index", +- {tag, "1.2.1"}}}, - {ebloom, "1.1.1", {git, "git://github.com/basho/ebloom", {tag, "1.1.1"}}}, -- {eper, "0.61", {git, "git://github.com/basho/eper.git", {tag, "fdfd63c0"}}}, -- {eleveldb, "1.1.0", {git, "git://github.com/basho/eleveldb.git", -- {tag, "1.1.1"}}}, -- {sext, ".*", {git, "git://github.com/esl/sext", {tag, "0.4.1"}}}, -- {riak_pipe, "1.1.2", {git, "git://github.com/basho/riak_pipe.git", -- {tag, "1.1.2"}}}, -- {basho_metrics, "1.0.0", {git, "git://github.com/basho/basho_metrics.git", -- {tag, "1.0.0"}}} +- {eper, "0.61", {git, "git://github.com/basho/eper.git", {tag, "3280b736"}}}, +- {eleveldb, "1.2.*", {git, "git://github.com/basho/eleveldb.git", +- {tag, "1.2.2p5"}}}, +- {sext, "0.4.*", {git, "git://github.com/esl/sext", {tag, "0.4.1"}}}, +- {riak_pipe, "1.2.*", {git, "git://github.com/basho/riak_pipe.git", +- {tag, "1.2.1p1"}}}, +- {riak_api, "1.2.*", {git, "git://github.com/basho/riak_api.git", {tag, "1.2.1"}}} - ]}. -- -1.7.11.2 +1.7.12.1 diff --git a/erlang-riak_kv-0002-Don-t-fail-on-warnings.patch b/erlang-riak_kv-0002-Don-t-fail-on-warnings.patch deleted file mode 100644 index d723165..0000000 --- a/erlang-riak_kv-0002-Don-t-fail-on-warnings.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3efd0881672153444809d9537f4c37fc0e8df42a Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Sat, 27 Nov 2010 20:09:59 +0300 -Subject: [PATCH 2/6] Don't fail on warnings - -Signed-off-by: Peter Lemenkov ---- - rebar.config | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rebar.config b/rebar.config -index 9a009c0..ada00f5 100644 ---- a/rebar.config -+++ b/rebar.config -@@ -1,7 +1,7 @@ - {require_otp_vsn, "R13B04|R14"}. - {cover_enabled, true}. - {edoc_opts, [{preprocess, true}]}. --{erl_opts, [warnings_as_errors, {parse_transform, lager_transform}]}. -+{erl_opts, [{parse_transform, lager_transform}]}. - - {erl_first_files, [ - "src/riak_kv_backend.erl", --- -1.7.11.2 - diff --git a/erlang-riak_kv-0002-Use-system-wide-mochijson2.patch b/erlang-riak_kv-0002-Use-system-wide-mochijson2.patch new file mode 100644 index 0000000..9ab73f3 --- /dev/null +++ b/erlang-riak_kv-0002-Use-system-wide-mochijson2.patch @@ -0,0 +1,27 @@ +From 3ed343b96982e3d05a842b3461e5ee87587cdce3 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Wed, 18 Jul 2012 22:41:10 +0400 +Subject: [PATCH 2/6] Use system-wide mochijson2 + +Signed-off-by: Peter Lemenkov +--- + src/riak_kv_js_vm.erl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/riak_kv_js_vm.erl b/src/riak_kv_js_vm.erl +index 2cf6367..66cb7fa 100644 +--- a/src/riak_kv_js_vm.erl ++++ b/src/riak_kv_js_vm.erl +@@ -372,7 +372,7 @@ maybe_idle(#state{in_batch=true}) -> + build_arg_list([], Accum) -> + lists:reverse(Accum); + build_arg_list([H|[]], Accum) -> +- build_arg_list([], [js_mochijson2:encode(H)|Accum]); ++ build_arg_list([], [mochijson2:encode(H)|Accum]); + build_arg_list([H|T], Accum) -> +- build_arg_list(T, [[js_mochijson2:encode(H), ","]|Accum]). ++ build_arg_list(T, [[mochijson2:encode(H), ","]|Accum]). + +-- +1.7.12.1 + diff --git a/erlang-riak_kv-0003-Guard-eunit-include-to-prevent-automatic-dependency-.patch b/erlang-riak_kv-0003-Guard-eunit-include-to-prevent-automatic-dependency-.patch new file mode 100644 index 0000000..506dd23 --- /dev/null +++ b/erlang-riak_kv-0003-Guard-eunit-include-to-prevent-automatic-dependency-.patch @@ -0,0 +1,45 @@ +From 5978a37de05cf3772b8635f70d629036202e1438 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Wed, 18 Jul 2012 22:55:53 +0400 +Subject: [PATCH 3/6] Guard eunit include to prevent automatic dependency + picking up + +Signed-off-by: Peter Lemenkov +--- + src/riak_kv_bucket.erl | 2 ++ + src/riak_kv_put_fsm.erl | 4 ++-- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/riak_kv_bucket.erl b/src/riak_kv_bucket.erl +index 63a1794..eeb1ae8 100644 +--- a/src/riak_kv_bucket.erl ++++ b/src/riak_kv_bucket.erl +@@ -25,7 +25,9 @@ + + -export([validate/1]). + ++-ifdef(TEST). + -include_lib("eunit/include/eunit.hrl"). ++-endif. + + -type prop() :: {PropName::atom(), PropValue::any()}. + -type error() :: {PropName::atom(), ErrorReason::atom()}. +diff --git a/src/riak_kv_put_fsm.erl b/src/riak_kv_put_fsm.erl +index ac52fc2..bd9ee3d 100644 +--- a/src/riak_kv_put_fsm.erl ++++ b/src/riak_kv_put_fsm.erl +@@ -23,9 +23,9 @@ + %% @doc coordination of Riak PUT requests + + -module(riak_kv_put_fsm). +-%-ifdef(TEST). ++-ifdef(TEST). + -include_lib("eunit/include/eunit.hrl"). +-%-endif. ++-endif. + -include_lib("riak_kv_vnode.hrl"). + -include_lib("riak_kv_js_pools.hrl"). + -include("riak_kv_wm_raw.hrl"). +-- +1.7.12.1 + diff --git a/erlang-riak_kv-0003-Use-system-wide-mochijson2.patch b/erlang-riak_kv-0003-Use-system-wide-mochijson2.patch deleted file mode 100644 index 6ff2e02..0000000 --- a/erlang-riak_kv-0003-Use-system-wide-mochijson2.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 8023836b9511f9704fdb597b588399663537b6ca Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Wed, 18 Jul 2012 22:41:10 +0400 -Subject: [PATCH 3/6] Use system-wide mochijson2 - -Signed-off-by: Peter Lemenkov ---- - src/riak_kv_js_vm.erl | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/riak_kv_js_vm.erl b/src/riak_kv_js_vm.erl -index 2cf6367..66cb7fa 100644 ---- a/src/riak_kv_js_vm.erl -+++ b/src/riak_kv_js_vm.erl -@@ -372,7 +372,7 @@ maybe_idle(#state{in_batch=true}) -> - build_arg_list([], Accum) -> - lists:reverse(Accum); - build_arg_list([H|[]], Accum) -> -- build_arg_list([], [js_mochijson2:encode(H)|Accum]); -+ build_arg_list([], [mochijson2:encode(H)|Accum]); - build_arg_list([H|T], Accum) -> -- build_arg_list(T, [[js_mochijson2:encode(H), ","]|Accum]). -+ build_arg_list(T, [[mochijson2:encode(H), ","]|Accum]). - --- -1.7.11.2 - diff --git a/erlang-riak_kv-0004-Fixes-Issue-326.patch b/erlang-riak_kv-0004-Fixes-Issue-326.patch deleted file mode 100644 index f1b5db4..0000000 --- a/erlang-riak_kv-0004-Fixes-Issue-326.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 00db115b50a99af09c45f4502864fce2958f2e1d Mon Sep 17 00:00:00 2001 -From: Michajlo Matijkiw -Date: Tue, 22 May 2012 16:26:33 -0400 -Subject: [PATCH 4/6] Fixes Issue #326 - ---- - src/riak_client.erl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/riak_client.erl b/src/riak_client.erl -index 0c881c4..357102e 100644 ---- a/src/riak_client.erl -+++ b/src/riak_client.erl -@@ -540,7 +540,7 @@ stream_list_keys(Input, Timeout, Client, ClientType) when is_pid(Client) -> - ReqId = mk_reqid(), - case Input of - {Bucket, FilterInput} -> -- case riak_kv_mapred_filter:build_filter(FilterInput) of -+ case riak_kv_mapred_filters:build_filter(FilterInput) of - {error, _Error} -> - {error, _Error}; - {ok, FilterExprs} -> --- -1.7.11.2 - diff --git a/erlang-riak_kv-0004-No-such-function-riak_kv_keys_fsm-start_link-6.patch b/erlang-riak_kv-0004-No-such-function-riak_kv_keys_fsm-start_link-6.patch new file mode 100644 index 0000000..9b54d4c --- /dev/null +++ b/erlang-riak_kv-0004-No-such-function-riak_kv_keys_fsm-start_link-6.patch @@ -0,0 +1,26 @@ +From 95738224cf6596de84011fc8e44fb79e7d6e6734 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Sun, 21 Oct 2012 11:43:06 +0400 +Subject: [PATCH 4/6] No such function riak_kv_keys_fsm:start_link/6 + +Signed-off-by: Peter Lemenkov +--- + src/lk.erl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lk.erl b/src/lk.erl +index eda7232..164fa7d 100644 +--- a/src/lk.erl ++++ b/src/lk.erl +@@ -26,7 +26,7 @@ + fsm(Bucket) -> + ReqId = random:uniform(10000), + Start = erlang:now(), +- riak_kv_keys_fsm:start_link(ReqId, Bucket, 60000, plain, 0.0001, self()), ++ riak_kv_keys_fsm_legacy:start_link(ReqId, Bucket, 60000, plain, 0.0001, self()), + {ok, Count} = gather_fsm_results(ReqId, 0), + End = erlang:now(), + Ms = erlang:round(timer:now_diff(End, Start) / 1000), +-- +1.7.12.1 + diff --git a/erlang-riak_kv-0005-Guard-eunit-include-to-prevent-automatic-dependency-.patch b/erlang-riak_kv-0005-Guard-eunit-include-to-prevent-automatic-dependency-.patch deleted file mode 100644 index 96cf32e..0000000 --- a/erlang-riak_kv-0005-Guard-eunit-include-to-prevent-automatic-dependency-.patch +++ /dev/null @@ -1,45 +0,0 @@ -From fc20b1fa201de7659cfdf2e06f45fd218975f9bc Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Wed, 18 Jul 2012 22:55:53 +0400 -Subject: [PATCH 5/6] Guard eunit include to prevent automatic dependency - picking up - -Signed-off-by: Peter Lemenkov ---- - src/riak_kv_bucket.erl | 2 ++ - src/riak_kv_put_fsm.erl | 4 ++-- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/riak_kv_bucket.erl b/src/riak_kv_bucket.erl -index 63a1794..eeb1ae8 100644 ---- a/src/riak_kv_bucket.erl -+++ b/src/riak_kv_bucket.erl -@@ -25,7 +25,9 @@ - - -export([validate/1]). - -+-ifdef(TEST). - -include_lib("eunit/include/eunit.hrl"). -+-endif. - - -type prop() :: {PropName::atom(), PropValue::any()}. - -type error() :: {PropName::atom(), ErrorReason::atom()}. -diff --git a/src/riak_kv_put_fsm.erl b/src/riak_kv_put_fsm.erl -index d6a8128..0e2b00b 100644 ---- a/src/riak_kv_put_fsm.erl -+++ b/src/riak_kv_put_fsm.erl -@@ -23,9 +23,9 @@ - %% @doc coordination of Riak PUT requests - - -module(riak_kv_put_fsm). --%-ifdef(TEST). -+-ifdef(TEST). - -include_lib("eunit/include/eunit.hrl"). --%-endif. -+-endif. - -include_lib("riak_kv_vnode.hrl"). - -include_lib("riak_kv_js_pools.hrl"). - -include("riak_kv_wm_raw.hrl"). --- -1.7.11.2 - diff --git a/erlang-riak_kv-0005-No-shuch-function-luke_flow-add_inputs-1.patch b/erlang-riak_kv-0005-No-shuch-function-luke_flow-add_inputs-1.patch new file mode 100644 index 0000000..c0f4a57 --- /dev/null +++ b/erlang-riak_kv-0005-No-shuch-function-luke_flow-add_inputs-1.patch @@ -0,0 +1,26 @@ +From b428248b8c29bf661b8e7461d4ff87a5c5d9404f Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Sun, 21 Oct 2012 12:06:23 +0400 +Subject: [PATCH 5/6] No shuch function luke_flow:add_inputs/1 + +Signed-off-by: Peter Lemenkov +--- + src/riak_kv_buckets_fsm.erl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/riak_kv_buckets_fsm.erl b/src/riak_kv_buckets_fsm.erl +index 96d7f53..37a94fe 100644 +--- a/src/riak_kv_buckets_fsm.erl ++++ b/src/riak_kv_buckets_fsm.erl +@@ -99,7 +99,7 @@ finish(clean, + from={raw, ReqId, ClientPid}}) -> + case ClientType of + mapred -> +- luke_flow:add_inputs(Buckets), ++ luke_flow:add_inputs(ClientPid, Buckets), + luke_flow:finish_inputs(ClientPid); + plain -> + ClientPid ! {ReqId, {buckets, sets:to_list(Buckets)}} +-- +1.7.12.1 + diff --git a/erlang-riak_kv-0006-Drop-check-for-specific-version-of-Erlang.patch b/erlang-riak_kv-0006-Drop-check-for-specific-version-of-Erlang.patch deleted file mode 100644 index 7ea65b0..0000000 --- a/erlang-riak_kv-0006-Drop-check-for-specific-version-of-Erlang.patch +++ /dev/null @@ -1,22 +0,0 @@ -From d2fd4296ccd43c66faaca5b33e57cf1e29c283da Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Wed, 18 Jul 2012 23:15:33 +0400 -Subject: [PATCH 6/6] Drop check for specific version of Erlang - -Signed-off-by: Peter Lemenkov ---- - rebar.config | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/rebar.config b/rebar.config -index ada00f5..9df3c65 100644 ---- a/rebar.config -+++ b/rebar.config -@@ -1,4 +1,3 @@ --{require_otp_vsn, "R13B04|R14"}. - {cover_enabled, true}. - {edoc_opts, [{preprocess, true}]}. - {erl_opts, [{parse_transform, lager_transform}]}. --- -1.7.11.2 - diff --git a/erlang-riak_kv-0006-Fix-stats-for-r15b02-due.patch b/erlang-riak_kv-0006-Fix-stats-for-r15b02-due.patch new file mode 100644 index 0000000..6422639 --- /dev/null +++ b/erlang-riak_kv-0006-Fix-stats-for-r15b02-due.patch @@ -0,0 +1,45 @@ +From d184f0aef212bf442669b954d4a812dc95b770fa Mon Sep 17 00:00:00 2001 +From: Russell Brown +Date: Thu, 25 Oct 2012 14:03:33 +0100 +Subject: [PATCH 6/6] Fix stats for r15b02 due + +OTP team removed the erlang:system_info(global_heap_size) stat +and so riak-admin status and riak stats fail hard. + +This commit wraps the call to said stat in a try catch. On < 15b02 +you get global heapsize. Otherwise you get the atom 'deprecated'. +--- + src/riak_kv_stat.erl | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/src/riak_kv_stat.erl b/src/riak_kv_stat.erl +index 6cd5240..b55c2fc 100644 +--- a/src/riak_kv_stat.erl ++++ b/src/riak_kv_stat.erl +@@ -418,7 +418,7 @@ system_stats() -> + [{nodename, node()}, + {connected_nodes, nodes()}, + {sys_driver_version, list_to_binary(erlang:system_info(driver_version))}, +- {sys_global_heaps_size, erlang:system_info(global_heaps_size)}, ++ {sys_global_heaps_size, safe_global_heap_size()}, + {sys_heap_type, erlang:system_info(heap_type)}, + {sys_logical_processors, erlang:system_info(logical_processors)}, + {sys_otp_release, list_to_binary(erlang:system_info(otp_release))}, +@@ -430,6 +430,14 @@ system_stats() -> + {sys_thread_pool_size, erlang:system_info(thread_pool_size)}, + {sys_wordsize, erlang:system_info(wordsize)}]. + ++safe_global_heap_size() -> ++ try erlang:system_info(global_heaps_size) of ++ N -> N ++ catch ++ error:badarg -> ++ deprecated ++ end. ++ + app_stats() -> + [{list_to_atom(atom_to_list(A) ++ "_version"), list_to_binary(V)} + || {A,_,V} <- application:which_applications()]. +-- +1.7.12.1 + diff --git a/erlang-riak_kv.spec b/erlang-riak_kv.spec index 0f764ad..9fe7fa9 100644 --- a/erlang-riak_kv.spec +++ b/erlang-riak_kv.spec @@ -1,31 +1,31 @@ %global realname riak_kv %global upstream basho %global debug_package %{nil} -%global git_tag 18643de +%global git_tag 7912e86 %global patchnumber 0 + Name: erlang-%{realname} -Version: 1.1.4 -Release: 1%{?dist} +Version: 1.2.1 +Release: 1.p2%{?dist} Summary: Riak Key/Value Store Group: Development/Languages License: ASL 2.0 URL: https://github.com/basho/riak_kv -# wget --content-disposition https://github.com/basho/riak_kv/tarball/1.1.4 -Source0: %{upstream}-%{realname}-%{version}-%{patchnumber}-g%{git_tag}.tar.gz +# wget --content-disposition https://github.com/basho/riak_kv/tarball/1.2.1p2 +Source0: %{upstream}-%{realname}-%{version}p2-%{patchnumber}-g%{git_tag}.tar.gz # Fedora/EPEL specific patch Patch1: erlang-riak_kv-0001-Don-t-check-for-deps-Fedora-EPEL-specific.patch # Fedora/EPEL specific patch -Patch2: erlang-riak_kv-0002-Don-t-fail-on-warnings.patch -# Fedora/EPEL specific patch -Patch3: erlang-riak_kv-0003-Use-system-wide-mochijson2.patch -# Backported -Patch4: erlang-riak_kv-0004-Fixes-Issue-326.patch +Patch2: erlang-riak_kv-0002-Use-system-wide-mochijson2.patch # Will be proposed for inclusion to upstream -Patch5: erlang-riak_kv-0005-Guard-eunit-include-to-prevent-automatic-dependency-.patch -# Fedora/EPEL specific patch -Patch6: erlang-riak_kv-0006-Drop-check-for-specific-version-of-Erlang.patch -#BuildRequires:erlang-basho_metrics +Patch3: erlang-riak_kv-0003-Guard-eunit-include-to-prevent-automatic-dependency-.patch +# Sent upstream - https://github.com/basho/riak_kv/pull/409 +Patch4: erlang-riak_kv-0004-No-such-function-riak_kv_keys_fsm-start_link-6.patch +# Sent upstream - https://github.com/basho/riak_kv/pull/410 +Patch5: erlang-riak_kv-0005-No-shuch-function-luke_flow-add_inputs-1.patch +# Backported from upstream +Patch6: erlang-riak_kv-0006-Fix-stats-for-r15b02-due.patch BuildRequires: erlang-bitcask BuildRequires: erlang-ebloom BuildRequires: erlang-eleveldb @@ -33,11 +33,12 @@ BuildRequires: erlang-erts BuildRequires: erlang-js BuildRequires: erlang-luke BuildRequires: erlang-rebar +BuildRequires: erlang-riak_api BuildRequires: erlang-riak_client BuildRequires: erlang-riak_core BuildRequires: erlang-riak_pipe BuildRequires: erlang-sext -Requires: erlang-basho_metrics%{?_isa} +# Error:erlang(dtrace:init/0) Requires: erlang-bitcask%{?_isa} Requires: erlang-cluster_info%{?_isa} Requires: erlang-crypto%{?_isa} @@ -45,21 +46,22 @@ Requires: erlang-ebloom%{?_isa} Requires: erlang-eleveldb%{?_isa} Requires: erlang-erts%{?_isa} Requires: erlang-eunit%{?_isa} +Requires: erlang-folsom%{?_isa} Requires: erlang-inets%{?_isa} Requires: erlang-js%{?_isa} Requires: erlang-kernel%{?_isa} Requires: erlang-lager%{?_isa} -# Error:erlang(luke_flow:add_inputs/1) Requires: erlang-luke%{?_isa} Requires: erlang-mochiweb%{?_isa} Requires: erlang-os_mon%{?_isa} -Requires: erlang-riak_client%{?_isa} +Requires: erlang-riak_api%{?_isa} Requires: erlang-riak_core%{?_isa} +Requires: erlang-riak_pb%{?_isa} Requires: erlang-riak_pipe%{?_isa} +Requires: erlang-runtime_tools%{?_isa} Requires: erlang-sext%{?_isa} Requires: erlang-stdlib%{?_isa} Requires: erlang-webmachine%{?_isa} -# Error:erlang(riak_kv_keys_fsm:start_link/6) %description @@ -67,13 +69,13 @@ Riak Key/Value Store. %prep -%setup -q -n %{upstream}-%{realname}-6b3f741 +%setup -q -n %{upstream}-%{realname}-7f9a4eb %patch1 -p1 -b .nodeps -%patch2 -p1 -b .no_fail_on_warn -%patch3 -p1 -b .systemwide_mochijson2 -%patch4 -p1 -%patch5 -p1 -b .noeunit -%patch6 -p1 +%patch2 -p1 -b .systemwide_mochijson2 +%patch3 -p1 -b .noeunit +%patch4 -p1 -b .fix_fun +%patch5 -p1 -b .fix_fun2 +%patch6 -p1 -b .r15b02 # remove bundled rebar copy - just to be absolutely sure rm -f ./rebar @@ -110,6 +112,9 @@ epmd -kill %changelog +* Sat Oct 27 2012 Peter Lemenkov - 1.2.1-1.p2 +- Ver. 1.2.1p2 + * Sun Aug 05 2012 Peter Lemenkov - 1.1.4-1 - Ver. 1.1.4 (security bugfix) diff --git a/sources b/sources index e746547..c1850cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ebdbe710610ad3f82892da568357430c basho-riak_kv-1.1.4-0-g18643de.tar.gz +765a8727dd1d064ac66a3bc8c0eb53d1 basho-riak_kv-1.2.1p2-0-g7912e86.tar.gz