[erlang-riak_core] Ver. 1.2.1
Peter Lemenkov
peter at fedoraproject.org
Wed Oct 10 10:56:37 UTC 2012
commit 41542cc9bc978563cb9db03b20a6f810a67151d8
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed Oct 10 14:56:30 2012 +0400
Ver. 1.2.1
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
.gitignore | 1 +
...hecking-for-specific-version-of-libraries.patch | 25 +++++++++--------
...obal-safe_whereis_name-1-has-been-removed.patch | 8 +++---
...-riak_core-0003-remove-duplicated-include.patch | 8 +++---
...e-0004-Guard-all-unguarded-eunit-includes.patch | 24 +++--------------
...export-riak_core_ring_manager-set_ring_gl.patch | 8 +++---
erlang-riak_core.spec | 28 +++++++++++++++-----
sources | 2 +-
8 files changed, 52 insertions(+), 52 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2a7e6bd..1bfaae4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/basho-riak_core-1.1.2-0-g2751120.tar.gz
+/basho-riak_core-1.2.1-0-g05d8895.tar.gz
diff --git a/erlang-riak_core-0001-Remove-checking-for-specific-version-of-libraries.patch b/erlang-riak_core-0001-Remove-checking-for-specific-version-of-libraries.patch
index 3f6cfdd..be6e839 100644
--- a/erlang-riak_core-0001-Remove-checking-for-specific-version-of-libraries.patch
+++ b/erlang-riak_core-0001-Remove-checking-for-specific-version-of-libraries.patch
@@ -1,4 +1,4 @@
-From db4ddd44bf78df766afc84fb360f2b505db8db48 Mon Sep 17 00:00:00 2001
+From bf6a5d7e5bc1b6e33dcf979e4fdffd3047e47c52 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat, 27 Nov 2010 16:37:23 +0300
Subject: [PATCH 1/5] Remove checking for specific version of libraries
@@ -10,28 +10,29 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
Conflicts:
rebar.config
---
- rebar.config | 11 -----------
- 1 file changed, 11 deletions(-)
+ rebar.config | 12 ------------
+ 1 file changed, 12 deletions(-)
diff --git a/rebar.config b/rebar.config
-index e6d4d73..03c8a4e 100644
+index 0fbd45c..03c8a4e 100644
--- a/rebar.config
+++ b/rebar.config
-@@ -3,14 +3,3 @@
+@@ -3,15 +3,3 @@
{erl_opts, [{parse_transform, lager_transform}]}.
{edoc_opts, [{preprocess, true}]}.
{erl_opts, [debug_info, warnings_as_errors]}.
-
-{deps, [
-- {lager, "1.0.0", {git, "git://github.com/basho/lager", {tag, "1.0.0"}}},
-- {poolboy, "0.6.1", {git, "git://github.com/basho/poolboy", {tag, "0.6.1"}}},
-- {protobuffs, "0.6.0", {git, "git://github.com/basho/erlang_protobuffs",
-- {tag, "protobuffs-0.6.0"}}},
+- {lager, "1.2.0", {git, "git://github.com/basho/lager", {tag, "1.2.0"}}},
+- {poolboy, "0.8.1", {git, "git://github.com/basho/poolboy", {tag, "0.8.1"}}},
+- {protobuffs, "0.7.0", {git, "git://github.com/basho/erlang_protobuffs",
+- {tag, "0.7.0"}}},
- {basho_stats, "1.0.2", {git, "git://github.com/basho/basho_stats", {tag, "1.0.2"}}},
- {riak_sysmon, "1.1.2", {git, "git://github.com/basho/riak_sysmon", {tag, "1.1.2"}}},
-- {webmachine, "1.9.1", {git, "git://github.com/basho/webmachine",
-- {tag, "1.9.1"}}}
+- {webmachine, "1.9.2", {git, "git://github.com/basho/webmachine",
+- {tag, "1.9.2p1"}}},
+- {folsom, ".*", {git, "git://github.com/boundary/folsom.git", {tag, "0.7"}}}
- ]}.
--
-1.7.10.4
+1.7.12
diff --git a/erlang-riak_core-0002-global-safe_whereis_name-1-has-been-removed.patch b/erlang-riak_core-0002-global-safe_whereis_name-1-has-been-removed.patch
index 21447e3..729fe93 100644
--- a/erlang-riak_core-0002-global-safe_whereis_name-1-has-been-removed.patch
+++ b/erlang-riak_core-0002-global-safe_whereis_name-1-has-been-removed.patch
@@ -1,14 +1,14 @@
-From 181b9d18d59f16cb16664abece513a6254b7b28a Mon Sep 17 00:00:00 2001
+From 7071659f8af4f32a6bb77b4b06f6d824b67dcf8c Mon Sep 17 00:00:00 2001
From: Emile Joubert <emile at rabbitmq.com>
Date: Wed, 14 Dec 2011 14:21:55 +0000
Subject: [PATCH 2/5] global:safe_whereis_name/1 has been removed
---
- src/gen_server2.erl | 4 ++--
+ src/gen_server2.erl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gen_server2.erl b/src/gen_server2.erl
-index 6d8d2ff..f019b56 100644
+index b64b37c..5a2e21a 100644
--- a/src/gen_server2.erl
+++ b/src/gen_server2.erl
@@ -956,7 +956,7 @@ get_proc_name({local, Name}) ->
@@ -30,5 +30,5 @@ index 6d8d2ff..f019b56 100644
exit(could_not_find_registerd_name);
Pid ->
--
-1.7.10.4
+1.7.12
diff --git a/erlang-riak_core-0003-remove-duplicated-include.patch b/erlang-riak_core-0003-remove-duplicated-include.patch
index 294d364..8d1e08a 100644
--- a/erlang-riak_core-0003-remove-duplicated-include.patch
+++ b/erlang-riak_core-0003-remove-duplicated-include.patch
@@ -1,15 +1,15 @@
-From cbcf615d8c245a66c7cf889e778deaadfb1ebdcd Mon Sep 17 00:00:00 2001
+From 3f611eb07bd0ba2943ef0e937d423da0e57bed72 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Mon, 11 Jun 2012 19:57:14 +0400
Subject: [PATCH 3/5] remove duplicated include
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
- src/riak_core_ring_manager.erl | 1 -
+ src/riak_core_ring_manager.erl | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/riak_core_ring_manager.erl b/src/riak_core_ring_manager.erl
-index cc6102a..86af280 100644
+index db7bda7..b04c595 100644
--- a/src/riak_core_ring_manager.erl
+++ b/src/riak_core_ring_manager.erl
@@ -23,7 +23,6 @@
@@ -21,5 +21,5 @@ index cc6102a..86af280 100644
-behaviour(gen_server2).
--
-1.7.10.4
+1.7.12
diff --git a/erlang-riak_core-0004-Guard-all-unguarded-eunit-includes.patch b/erlang-riak_core-0004-Guard-all-unguarded-eunit-includes.patch
index c70dabb..49b2e9e 100644
--- a/erlang-riak_core-0004-Guard-all-unguarded-eunit-includes.patch
+++ b/erlang-riak_core-0004-Guard-all-unguarded-eunit-includes.patch
@@ -1,13 +1,12 @@
-From 785e2714f75f16f1f6764161379256336d3b0da0 Mon Sep 17 00:00:00 2001
+From 9183c9659d5616d1a7b4c83351e44f00dbda7777 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Mon, 11 Jun 2012 20:09:25 +0400
Subject: [PATCH 4/5] Guard all unguarded eunit includes
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
- src/merkerl.erl | 7 ++++---
- src/slide.erl | 3 +++
- 2 files changed, 7 insertions(+), 3 deletions(-)
+ src/merkerl.erl | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/merkerl.erl b/src/merkerl.erl
index b210cd9..dfa36fe 100644
@@ -38,21 +37,6 @@ index b210cd9..dfa36fe 100644
-
+-endif.
-diff --git a/src/slide.erl b/src/slide.erl
-index 3ee69d1..b78b63f 100644
---- a/src/slide.erl
-+++ b/src/slide.erl
-@@ -54,7 +54,10 @@
- -export([private_dir/0, sync/1]).
-
- -include_lib("kernel/include/file.hrl").
-+
-+-ifdef(TEST).
- -include_lib("eunit/include/eunit.hrl").
-+-endif.
-
- -define(DIR, "/tmp/riak/slide-data"). % SLF TODO: need pkg-specific data dir handling
- -define(REC_BYTES, 12). % 4 + (size(term_to_binary(4000000000)) = 8)
--
-1.7.10.4
+1.7.12
diff --git a/erlang-riak_core-0005-Explicitly-export-riak_core_ring_manager-set_ring_gl.patch b/erlang-riak_core-0005-Explicitly-export-riak_core_ring_manager-set_ring_gl.patch
index d6bcffa..e0a65f6 100644
--- a/erlang-riak_core-0005-Explicitly-export-riak_core_ring_manager-set_ring_gl.patch
+++ b/erlang-riak_core-0005-Explicitly-export-riak_core_ring_manager-set_ring_gl.patch
@@ -1,4 +1,4 @@
-From 24dc9c5a44441424e226669fba3f4326bb0c7815 Mon Sep 17 00:00:00 2001
+From 8836376b00dafb78468829d13aab420406fb32b6 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu, 19 Jul 2012 10:13:58 +0400
Subject: [PATCH 5/5] Explicitly export
@@ -7,11 +7,11 @@ Subject: [PATCH 5/5] Explicitly export
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
- src/riak_core_ring_manager.erl | 3 ++-
+ src/riak_core_ring_manager.erl | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/riak_core_ring_manager.erl b/src/riak_core_ring_manager.erl
-index 86af280..897ee38 100644
+index b04c595..6167269 100644
--- a/src/riak_core_ring_manager.erl
+++ b/src/riak_core_ring_manager.erl
@@ -47,13 +47,14 @@
@@ -31,5 +31,5 @@ index 86af280..897ee38 100644
-endif.
--
-1.7.10.4
+1.7.12
diff --git a/erlang-riak_core.spec b/erlang-riak_core.spec
index e56b32e..6d9f38d 100644
--- a/erlang-riak_core.spec
+++ b/erlang-riak_core.spec
@@ -1,18 +1,18 @@
%global realname riak_core
%global upstream basho
%global debug_package %{nil}
-%global git_tag 2751120
+%global git_tag 05d8895
%global patchnumber 0
Name: erlang-%{realname}
-Version: 1.1.2
-Release: 3%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
Summary: Distributed systems infrastructure used by Riak
Group: Development/Languages
License: ASL 2.0
URL: https://github.com/basho/riak_core
-# wget --no-check-certificate --content-disposition https://github.com/basho/riak_core/tarball/1.1.2
+# wget --content-disposition https://github.com/basho/riak_core/tarball/1.2.0
Source0: %{upstream}-%{realname}-%{version}-%{patchnumber}-g%{git_tag}.tar.gz
# Fedora/EPEL specific
Patch1: erlang-riak_core-0001-Remove-checking-for-specific-version-of-libraries.patch
@@ -29,16 +29,20 @@ Patch5: erlang-riak_core-0005-Explicitly-export-riak_core_ring_manager-set_ring
# testing then you may remove these lines):
BuildRequires: erlang-basho_stats
BuildRequires: erlang-cluster_info
+BuildRequires: erlang-folsom
BuildRequires: erlang-lager
BuildRequires: erlang-mochiweb
BuildRequires: erlang-poolboy
BuildRequires: erlang-riak_sysmon
# Compile-time requirements
+BuildRequires: erlang-meck >= 0.7.2
BuildRequires: erlang-rebar
-BuildRequires: erlang-protobuffs
+BuildRequires: erlang-protobuffs >= 0.7.0
BuildRequires: erlang-webmachine
+# Error:erlang(dtrace:init/0)
+# Error:erlang(dtrace:put_utag/1)
Requires: erlang-basho_stats%{?_isa}
Requires: erlang-cluster_info%{?_isa}
Requires: erlang-crypto%{?_isa}
@@ -49,6 +53,8 @@ Requires: erlang-crypto%{?_isa}
# Error:erlang(lists:keyfind/3) in R12B and below
# Error:erlang(os:timestamp/0) in R12B and below
Requires: erlang-erts%{?_isa} >= R13B
+Requires: erlang-eunit%{?_isa}
+Requires: erlang-folsom%{?_isa}
Requires: erlang-inets%{?_isa}
Requires: erlang-kernel%{?_isa}
Requires: erlang-lager%{?_isa}
@@ -56,7 +62,9 @@ Requires: erlang-mochiweb%{?_isa}
Requires: erlang-poolboy%{?_isa}
Requires: erlang-protobuffs%{?_isa}
Requires: erlang-riak_sysmon%{?_isa}
-Requires: erlang-runtime_tools%{?_isa}
+# Error:erlang(dyntrace:p/0) in R14B and below
+# Error:erlang(dyntrace:put_tag/1) in R14B and below
+Requires: erlang-runtime_tools%{?_isa} >= R15B
# Error:erlang(ssl:ssl_accept/3) in R12B and below
Requires: erlang-ssl%{?_isa} >= R13B
# Error:erlang(supervisor:count_children/1) in R12B and below
@@ -69,7 +77,7 @@ Distributed systems infrastructure used by Riak.
%prep
-%setup -q -n %{upstream}-%{realname}-e3ac25f
+%setup -q -n %{upstream}-%{realname}-5e95575
%patch1 -p1 -b .dont_check_for_libs
%patch2 -p1 -b .r15b01
%patch3 -p1 -b .duplicated_unguarded_eunit_include
@@ -102,6 +110,12 @@ rebar eunit -v
%changelog
+* Wed Oct 10 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.2.1-1
+- Ver. 1.2.1
+
+* Wed Sep 05 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.2.0-1
+- Ver. 1.2.0
+
* Thu Jul 19 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.1.2-3
- Re-export one handy function
diff --git a/sources b/sources
index 6b6f601..acad72e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-32ac278e5b729fd0652f697bef24cf93 basho-riak_core-1.1.2-0-g2751120.tar.gz
+5e34e55fe40c0d87abe5c4693d41db2b basho-riak_core-1.2.1-0-g05d8895.tar.gz
More information about the scm-commits
mailing list