diff --git a/.gitignore b/.gitignore index 6a581a0..0783449 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /basho-riak_kv-1.2.1p2-0-g7912e86.tar.gz /basho-riak_kv-1.2.1p3-0-g0400120.tar.gz /basho-riak_kv-1.3.1-0-geb24ff9.tar.gz +/riak_kv-1.3.2.tar.gz diff --git a/erlang-riak_kv-0001-Use-system-wide-mochijson2.patch b/erlang-riak_kv-0001-Use-system-wide-mochijson2.patch index dd590d1..87b4dce 100644 --- a/erlang-riak_kv-0001-Use-system-wide-mochijson2.patch +++ b/erlang-riak_kv-0001-Use-system-wide-mochijson2.patch @@ -1,7 +1,7 @@ -From 3ece384b45e5170b408b1eca72cea0d5b7644846 Mon Sep 17 00:00:00 2001 +From b6d9504796712c5ad3ef81eb45d7e902b17bae00 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 18 Jul 2012 22:41:10 +0400 -Subject: [PATCH 1/8] Use system-wide mochijson2 +Subject: [PATCH 01/10] Use system-wide mochijson2 Signed-off-by: Peter Lemenkov --- @@ -23,5 +23,5 @@ index 2cf6367..66cb7fa 100644 + build_arg_list(T, [[mochijson2:encode(H), ","]|Accum]). -- -1.8.1.4 +1.8.3.1 diff --git a/erlang-riak_kv-0002-Guard-eunit-include-to-prevent-automatic-dependency-.patch b/erlang-riak_kv-0002-Guard-eunit-include-to-prevent-automatic-dependency-.patch index 48a0ea3..9990a41 100644 --- a/erlang-riak_kv-0002-Guard-eunit-include-to-prevent-automatic-dependency-.patch +++ b/erlang-riak_kv-0002-Guard-eunit-include-to-prevent-automatic-dependency-.patch @@ -1,7 +1,7 @@ -From 6855dd559668ec07fdc18e2625d6aa190f1e52ed Mon Sep 17 00:00:00 2001 +From 1ba3dab46561523b0abf5c2aa1f818c81ad35c4f Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 18 Jul 2012 22:55:53 +0400 -Subject: [PATCH 2/8] Guard eunit include to prevent automatic dependency +Subject: [PATCH 02/10] Guard eunit include to prevent automatic dependency picking up Signed-off-by: Peter Lemenkov @@ -25,7 +25,7 @@ index e839459..339b10c 100644 -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 f3e1b1d..ff880fe 100644 +index 33e5108..f3bad4d 100644 --- a/src/riak_kv_put_fsm.erl +++ b/src/riak_kv_put_fsm.erl @@ -23,9 +23,9 @@ @@ -41,5 +41,5 @@ index f3e1b1d..ff880fe 100644 -include_lib("riak_kv_js_pools.hrl"). -include("riak_kv_wm_raw.hrl"). -- -1.8.1.4 +1.8.3.1 diff --git a/erlang-riak_kv-0003-use-tuple-modules-instead-of-parameterized-modules.patch b/erlang-riak_kv-0003-use-tuple-modules-instead-of-parameterized-modules.patch index 20e3963..df700c8 100644 --- a/erlang-riak_kv-0003-use-tuple-modules-instead-of-parameterized-modules.patch +++ b/erlang-riak_kv-0003-use-tuple-modules-instead-of-parameterized-modules.patch @@ -1,7 +1,7 @@ -From f402d32c6fd6af1a6a9e634873ae9e1c2673b248 Mon Sep 17 00:00:00 2001 +From 4f3684c80badc6206dfe861066ae3605d2b50727 Mon Sep 17 00:00:00 2001 From: Steve Vinoski Date: Wed, 23 Jan 2013 13:34:53 -0500 -Subject: [PATCH 3/8] use tuple modules instead of parameterized modules +Subject: [PATCH 03/10] use tuple modules instead of parameterized modules Erlang R16, coming soon, will do away with parameterized modules (see Issue 4 under http://www.erlang.org/news/35 for details). Change riak_client to @@ -12,7 +12,7 @@ and beyond. These changes are backward compatible. 1 file changed, 134 insertions(+), 120 deletions(-) diff --git a/src/riak_client.erl b/src/riak_client.erl -index d92e3a2..3972518 100644 +index 5d72fb3..7aaeee9 100644 --- a/src/riak_client.erl +++ b/src/riak_client.erl @@ -2,7 +2,7 @@ @@ -606,5 +606,5 @@ index d92e3a2..3972518 100644 %% @private mk_reqid() -> -- -1.8.1.4 +1.8.3.1 diff --git a/erlang-riak_kv-0004-Don-t-fail-on-warnings.patch b/erlang-riak_kv-0004-Don-t-fail-on-warnings.patch index 2bad8ea..04861c2 100644 --- a/erlang-riak_kv-0004-Don-t-fail-on-warnings.patch +++ b/erlang-riak_kv-0004-Don-t-fail-on-warnings.patch @@ -1,7 +1,7 @@ -From b46f6c9bafe97dfa3b8902514549c922128c1638 Mon Sep 17 00:00:00 2001 +From 2dcf5e59d42c824c76c87c8400e844b36371d192 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 12 Mar 2013 09:38:33 +0400 -Subject: [PATCH 4/8] Don't fail on warnings +Subject: [PATCH 04/10] Don't fail on warnings Signed-off-by: Peter Lemenkov --- @@ -9,7 +9,7 @@ Signed-off-by: Peter Lemenkov 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rebar.config b/rebar.config -index 92dacec..6a2771c 100644 +index 8c80150..93ee6ee 100644 --- a/rebar.config +++ b/rebar.config @@ -1,7 +1,7 @@ @@ -22,5 +22,5 @@ index 92dacec..6a2771c 100644 {erl_first_files, [ -- -1.8.1.4 +1.8.3.1 diff --git a/erlang-riak_kv-0005-Relax-dependency-checks.patch b/erlang-riak_kv-0005-Relax-dependency-checks.patch index 86dce7c..8fe97e0 100644 --- a/erlang-riak_kv-0005-Relax-dependency-checks.patch +++ b/erlang-riak_kv-0005-Relax-dependency-checks.patch @@ -1,26 +1,31 @@ -From 392b19c42953ee0ed6ac16177569a7394cfc65bd Mon Sep 17 00:00:00 2001 +From 2ac9e98748c0a3e38847e0872cb867e79d832507 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 12 Mar 2013 09:39:00 +0400 -Subject: [PATCH 5/8] Relax dependency checks +Subject: [PATCH 05/10] Relax dependency checks Signed-off-by: Peter Lemenkov --- - rebar.config | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + rebar.config | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rebar.config b/rebar.config -index 6a2771c..3643625 100644 +index 93ee6ee..e82ed18 100644 --- a/rebar.config +++ b/rebar.config -@@ -16,7 +16,7 @@ +@@ -17,11 +17,11 @@ {merge_index, "1.3.0", {git, "git://github.com/basho/merge_index", {tag, "1.3.0"}}}, {ebloom, "1.1.2", {git, "git://github.com/basho/ebloom", {tag, "1.1.2"}}}, - {eper, "0.61", {git, "git://github.com/basho/eper.git", {tag, "3280b736"}}}, + {eper, "0.6.", {git, "git://github.com/basho/eper.git", {tag, "3280b736"}}}, - {eleveldb, "1.3.0", {git, "git://github.com/basho/eleveldb.git", - {tag, "1.3.0"}}}, + {eleveldb, "1.3.2", {git, "git://github.com/basho/eleveldb.git", + {tag, "1.3.2"}}}, {sext, "1.1", {git, "git://github.com/uwiger/sext", {tag, "1.1"}}}, + {riak_pipe, "1.3.2", {git, "git://github.com/basho/riak_pipe.git", + {tag, "1.3.2"}}}, +- {riak_api, "1.3.1", {git, "git://github.com/basho/riak_api.git", {tag, "1.3.2"}}} ++ {riak_api, "1.3.2", {git, "git://github.com/basho/riak_api.git", {tag, "1.3.2"}}} + ]}. -- -1.8.1.4 +1.8.3.1 diff --git a/erlang-riak_kv-0006-Move-setting-bucket-properties-to-riak_api-see-basho.patch b/erlang-riak_kv-0006-Move-setting-bucket-properties-to-riak_api-see-basho.patch index a768734..ca30f34 100644 --- a/erlang-riak_kv-0006-Move-setting-bucket-properties-to-riak_api-see-basho.patch +++ b/erlang-riak_kv-0006-Move-setting-bucket-properties-to-riak_api-see-basho.patch @@ -1,7 +1,7 @@ -From 34e9d7aa8c0d3a75383d61707ddd2819307c4ef6 Mon Sep 17 00:00:00 2001 +From 69cab50c4c632ac2b0f6f92cff822fce90b6e407 Mon Sep 17 00:00:00 2001 From: Sean Cribbs Date: Fri, 15 Feb 2013 16:09:41 -0600 -Subject: [PATCH 6/8] Move setting bucket properties to riak_api, see +Subject: [PATCH 06/10] Move setting bucket properties to riak_api, see basho/riak_api#31 basho/riak_pb#30 --- @@ -10,7 +10,7 @@ Subject: [PATCH 6/8] Move setting bucket properties to riak_api, see 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/src/riak_kv_app.erl b/src/riak_kv_app.erl -index e5ca480..c1cb6bf 100644 +index eb662da..b70b1fb 100644 --- a/src/riak_kv_app.erl +++ b/src/riak_kv_app.erl @@ -28,7 +28,7 @@ @@ -72,5 +72,5 @@ index 1f40c7d..f54cedc 100644 %% @doc process_stream/3 callback. Handles streaming keys messages. process_stream({ReqId, done}, ReqId, -- -1.8.1.4 +1.8.3.1 diff --git a/erlang-riak_kv-0007-Fix-module-loading-order-for-tests.patch b/erlang-riak_kv-0007-Fix-module-loading-order-for-tests.patch index 5b9c229..177d555 100644 --- a/erlang-riak_kv-0007-Fix-module-loading-order-for-tests.patch +++ b/erlang-riak_kv-0007-Fix-module-loading-order-for-tests.patch @@ -1,7 +1,7 @@ -From 06defb98aff1d1f27c5f8fb5f90c82b983a46377 Mon Sep 17 00:00:00 2001 +From 28f52ced3ab1c47485ac271e3bd44910a00bce17 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 24 Mar 2013 13:42:25 +0400 -Subject: [PATCH 7/8] Fix module loading order (for tests) +Subject: [PATCH 07/10] Fix module loading order (for tests) Signed-off-by: Peter Lemenkov --- @@ -9,20 +9,20 @@ Signed-off-by: Peter Lemenkov 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/riak_kv_test_util.erl b/src/riak_kv_test_util.erl -index 6a5d8e4..99e1d92 100644 +index a5f3dc0..89a518a 100644 --- a/src/riak_kv_test_util.erl +++ b/src/riak_kv_test_util.erl @@ -245,8 +245,8 @@ dep_apps(Test, Extra) -> end, [sasl, Silencer, crypto, public_key, ssl, riak_sysmon, os_mon, -- runtime_tools, erlang_js, inets, mochiweb, webmachine, +- runtime_tools, erlang_js, inets, mochiweb, webmachine, sidejob, - basho_stats, bitcask, compiler, syntax_tools, lager, folsom, -+ runtime_tools, erlang_js, inets, xmerl, compiler, syntax_tools, mochiweb, webmachine, -+ basho_stats, bitcask, lager, ++ runtime_tools, erlang_js, inets, xmerl, compiler, syntax_tools, mochiweb, webmachine, sidejob, ++ basho_stats, bitcask, lager, folsom, riak_core, riak_pipe, riak_api, riak_kv, DefaultSetupFun, Extra]. -- -1.8.1.4 +1.8.3.1 diff --git a/erlang-riak_kv-0008-migrate-mapred_test-to-riak_test.patch b/erlang-riak_kv-0008-migrate-mapred_test-to-riak_test.patch index 2de2748..a0d656d 100644 --- a/erlang-riak_kv-0008-migrate-mapred_test-to-riak_test.patch +++ b/erlang-riak_kv-0008-migrate-mapred_test-to-riak_test.patch @@ -1,7 +1,7 @@ -From be4b3a8fdbe180af9ccb341bd8717989740eba04 Mon Sep 17 00:00:00 2001 +From 78298188c9f515065970bc26c4736e90f14f8704 Mon Sep 17 00:00:00 2001 From: Bryan Fink Date: Tue, 19 Feb 2013 08:56:34 -0500 -Subject: [PATCH 8/8] migrate mapred_test to riak_test +Subject: [PATCH 08/10] migrate mapred_test to riak_test This suite had a fragile setup stage that would regularly cause the automated testers to fail. It has been migrated to the following @@ -19,7 +19,7 @@ mapred_basic_compat delete mode 100644 test/mapred_test.erl diff --git a/src/riak_kv_mrc_pipe.erl b/src/riak_kv_mrc_pipe.erl -index 15f29be..0be2f30 100644 +index 63ba133..1620ac2 100644 --- a/src/riak_kv_mrc_pipe.erl +++ b/src/riak_kv_mrc_pipe.erl @@ -959,6 +959,9 @@ example_setup() -> @@ -800,5 +800,5 @@ index 27a4a7c..0000000 -wait_until_dead(_) -> - ok. -- -1.8.1.4 +1.8.3.1 diff --git a/erlang-riak_kv-0009-Allow-building-against-bitcask-1.6.3.patch b/erlang-riak_kv-0009-Allow-building-against-bitcask-1.6.3.patch new file mode 100644 index 0000000..e3b7cbf --- /dev/null +++ b/erlang-riak_kv-0009-Allow-building-against-bitcask-1.6.3.patch @@ -0,0 +1,26 @@ +From 932a18ae2a558af4a46ae259143426ea1100827a Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Wed, 31 Jul 2013 20:33:29 +0400 +Subject: [PATCH 09/10] Allow building against bitcask 1.6.3 + +Signed-off-by: Peter Lemenkov +--- + rebar.config | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rebar.config b/rebar.config +index e82ed18..69aedac 100644 +--- a/rebar.config ++++ b/rebar.config +@@ -13,7 +13,7 @@ + {riak_core, "1.3.2", {git, "git://github.com/basho/riak_core", {tag, "1.3.2"}}}, + {sidejob, "0.2.0", {git, "git://github.com/basho/sidejob", {tag, "0.2.0"}}}, + {erlang_js, "1.2.2", {git, "git://github.com/basho/erlang_js", {tag, "1.2.2"}}}, +- {bitcask, "1.6.2", {git, "git://github.com/basho/bitcask", {tag, "1.6.2"}}}, ++ {bitcask, "1.6.3", {git, "git://github.com/basho/bitcask", {tag, "1.6.3"}}}, + {merge_index, "1.3.0", {git, "git://github.com/basho/merge_index", + {tag, "1.3.0"}}}, + {ebloom, "1.1.2", {git, "git://github.com/basho/ebloom", {tag, "1.1.2"}}}, +-- +1.8.3.1 + diff --git a/erlang-riak_kv-0010-Fix-for-Erlang-R16B01.patch b/erlang-riak_kv-0010-Fix-for-Erlang-R16B01.patch new file mode 100644 index 0000000..bf65e88 --- /dev/null +++ b/erlang-riak_kv-0010-Fix-for-Erlang-R16B01.patch @@ -0,0 +1,26 @@ +From 993dd97e5b607fcb796777c7308c0c1d31b8619d Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Wed, 31 Jul 2013 22:04:36 +0400 +Subject: [PATCH 10/10] Fix for Erlang R16B01 + +Signed-off-by: Peter Lemenkov +--- + src/riak_kv_test_util.erl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/riak_kv_test_util.erl b/src/riak_kv_test_util.erl +index 89a518a..864c637 100644 +--- a/src/riak_kv_test_util.erl ++++ b/src/riak_kv_test_util.erl +@@ -244,7 +244,7 @@ dep_apps(Test, Extra) -> + (_) -> ok + end, + +- [sasl, Silencer, crypto, public_key, ssl, riak_sysmon, os_mon, ++ [sasl, Silencer, asn1, crypto, public_key, ssl, riak_sysmon, os_mon, + runtime_tools, erlang_js, inets, xmerl, compiler, syntax_tools, mochiweb, webmachine, sidejob, + basho_stats, bitcask, lager, folsom, + riak_core, riak_pipe, riak_api, riak_kv, DefaultSetupFun, Extra]. +-- +1.8.3.1 + diff --git a/erlang-riak_kv.spec b/erlang-riak_kv.spec index b430ace..5221698 100644 --- a/erlang-riak_kv.spec +++ b/erlang-riak_kv.spec @@ -1,19 +1,23 @@ %global realname riak_kv -%global upstream basho +# +# This package contains only arch-independent data but install it into +# arch-dependent directory thus making this package arch-dependent. In order to +# suppress empty *-debuginfo generation we have to explicitly order +# debuginfo-generator to skip trying to build *-debuiginfo for that package. +# %global debug_package %{nil} -%global git_tag eb24ff9 %global patchnumber 0 Name: erlang-%{realname} -Version: 1.3.1 -Release: 2%{?dist} +Version: 1.3.2 +Release: 1%{?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.3.1 -Source0: %{upstream}-%{realname}-%{version}-%{patchnumber}-g%{git_tag}.tar.gz +VCS: https://github.com/basho/riak_kv.git +Source0: https://github.com/basho/riak_kv/archive/%{version}/%{realname}-%{version}.tar.gz # Fedora/EPEL specific patch Patch1: erlang-riak_kv-0001-Use-system-wide-mochijson2.patch # Will be proposed for inclusion to upstream @@ -30,38 +34,44 @@ Patch6: erlang-riak_kv-0006-Move-setting-bucket-properties-to-riak_api-see-bash Patch7: erlang-riak_kv-0007-Fix-module-loading-order-for-tests.patch # Backported from upstream Patch8: erlang-riak_kv-0008-migrate-mapred_test-to-riak_test.patch -BuildRequires: erlang-bitcask >= 1.6.0 +# Fedora/EPEL specific patch +Patch9: erlang-riak_kv-0009-Allow-building-against-bitcask-1.6.3.patch +# Fedora/EPEL specific patch +Patch10: erlang-riak_kv-0010-Fix-for-Erlang-R16B01.patch +BuildRequires: erlang-bitcask >= 1.6.2 BuildRequires: erlang-ebloom >= 1.1.2 -BuildRequires: erlang-eleveldb >= 1.3.0 +BuildRequires: erlang-eleveldb >= 1.3.2 BuildRequires: erlang-eper >= 0.60 BuildRequires: erlang-js >= 1.2.2 BuildRequires: erlang-merge_index >= 1.3.0 BuildRequires: erlang-os_mon BuildRequires: erlang-rebar -BuildRequires: erlang-riak_api >= 1.3.1 -BuildRequires: erlang-riak_core >= 1.3.1 -BuildRequires: erlang-riak_pipe >= 1.3.1 +BuildRequires: erlang-riak_api >= 1.3.2 +BuildRequires: erlang-riak_core >= 1.3.2 +BuildRequires: erlang-riak_pipe >= 1.3.2 BuildRequires: erlang-sext >= 1.1 +BuildRequires: erlang-sidejob >= 0.2.0 # Error:erlang(dtrace:init/0) -Requires: erlang-bitcask%{?_isa} +Requires: erlang-bitcask%{?_isa} >= 1.6.2 Requires: erlang-cluster_info%{?_isa} Requires: erlang-crypto%{?_isa} -Requires: erlang-eleveldb%{?_isa} +Requires: erlang-eleveldb%{?_isa} >= 1.3.2 Requires: erlang-erts%{?_isa} Requires: erlang-eunit%{?_isa} Requires: erlang-folsom%{?_isa} Requires: erlang-inets%{?_isa} -Requires: erlang-js%{?_isa} +Requires: erlang-js%{?_isa} >= 1.2.2 Requires: erlang-kernel%{?_isa} Requires: erlang-lager%{?_isa} Requires: erlang-mochiweb%{?_isa} Requires: erlang-os_mon%{?_isa} -Requires: erlang-riak_api%{?_isa} -Requires: erlang-riak_core%{?_isa} +Requires: erlang-riak_api%{?_isa} >= 1.3.2 +Requires: erlang-riak_core%{?_isa} >= 1.3.2 Requires: erlang-riak_pb%{?_isa} -Requires: erlang-riak_pipe%{?_isa} +Requires: erlang-riak_pipe%{?_isa} >= 1.3.2 Requires: erlang-runtime_tools%{?_isa} -Requires: erlang-sext%{?_isa} +Requires: erlang-sext%{?_isa} >= 1.1 +Requires: erlang-sidejob%{?_isa} Requires: erlang-stdlib%{?_isa} Requires: erlang-webmachine%{?_isa} @@ -71,7 +81,7 @@ Riak Key/Value Store. %prep -%setup -q -n %{upstream}-%{realname}-7e90693 +%setup -q -n %{realname}-%{version} %patch1 -p1 -b .systemwide_mochijson2 %patch2 -p1 -b .noeunit %patch3 -p1 -b .r16 @@ -80,6 +90,8 @@ Riak Key/Value Store. %patch6 -p1 -b .fix_pb %patch7 -p1 -b .fix_order %patch8 -p1 -b .remove_problematic_fragile_test_suite +%patch9 -p1 -b .relax_bitcask_ver +%patch10 -p1 -b .r16b01 # remove bundled rebar copy - just to be absolutely sure rm -f ./rebar @@ -98,8 +110,6 @@ install -p -m 0755 priv/mapred_builtins.js %{buildroot}%{_libdir}/erlang/lib/%{r %check -# Clean up beam-files to suppress lots of warnings -#rm -f ebin/*.beam # Several tests requires epmd to run epmd -daemon rebar eunit skip_deps=true -v || true @@ -108,6 +118,7 @@ epmd -kill %files +%doc docs/* README.org %dir %{_libdir}/erlang/lib/%{realname}-%{version}/ %dir %{_libdir}/erlang/lib/%{realname}-%{version}/ebin/ %dir %{_libdir}/erlang/lib/%{realname}-%{version}/include/ @@ -119,6 +130,9 @@ epmd -kill %changelog +* Tue Aug 06 2013 Peter Lemenkov - 1.3.2-1 +- Ver. 1.3.2 + * Sat Aug 03 2013 Fedora Release Engineering - 1.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 6999ac2..6e735b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4ddd140e0cf5fd041085f874a810853e basho-riak_kv-1.3.1-0-geb24ff9.tar.gz +918de60aebacaf2e6b02f8e9a09277cb riak_kv-1.3.2.tar.gz