[erlang-riak_core: 1/2] Re-export one handy function (required by riak_kv)
Peter Lemenkov
peter at fedoraproject.org
Thu Jul 19 06:27:46 UTC 2012
commit 5a2d5c6d24b8153c1c672f15e10c000f839b202b
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu Jul 19 10:26:04 2012 +0400
Re-export one handy function (required by riak_kv)
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
...hecking-for-specific-version-of-libraries.patch | 4 +-
...obal-safe_whereis_name-1-has-been-removed.patch | 4 +-
...-riak_core-0003-remove-duplicated-include.patch | 4 +-
...e-0004-Guard-all-unguarded-eunit-includes.patch | 4 +-
...export-riak_core_ring_manager-set_ring_gl.patch | 35 ++++++++++++++++++
erlang-riak_core.spec | 38 +++++++++++--------
6 files changed, 65 insertions(+), 24 deletions(-)
---
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 b2bd508..3f6cfdd 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,7 +1,7 @@
From db4ddd44bf78df766afc84fb360f2b505db8db48 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/4] Remove checking for specific version of libraries
+Subject: [PATCH 1/5] Remove checking for specific version of libraries
This is purely Fedora/EPEL specific and won't go upstream.
@@ -33,5 +33,5 @@ index e6d4d73..03c8a4e 100644
- {tag, "1.9.1"}}}
- ]}.
--
-1.7.10.2
+1.7.10.4
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 9cf3063..21447e3 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,7 +1,7 @@
From 181b9d18d59f16cb16664abece513a6254b7b28a 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/4] global:safe_whereis_name/1 has been removed
+Subject: [PATCH 2/5] global:safe_whereis_name/1 has been removed
---
src/gen_server2.erl | 4 ++--
@@ -30,5 +30,5 @@ index 6d8d2ff..f019b56 100644
exit(could_not_find_registerd_name);
Pid ->
--
-1.7.10.2
+1.7.10.4
diff --git a/erlang-riak_core-0003-remove-duplicated-include.patch b/erlang-riak_core-0003-remove-duplicated-include.patch
index 6b447d0..294d364 100644
--- a/erlang-riak_core-0003-remove-duplicated-include.patch
+++ b/erlang-riak_core-0003-remove-duplicated-include.patch
@@ -1,7 +1,7 @@
From cbcf615d8c245a66c7cf889e778deaadfb1ebdcd 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/4] remove duplicated include
+Subject: [PATCH 3/5] remove duplicated include
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -21,5 +21,5 @@ index cc6102a..86af280 100644
-behaviour(gen_server2).
--
-1.7.10.2
+1.7.10.4
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 fd197be..c70dabb 100644
--- a/erlang-riak_core-0004-Guard-all-unguarded-eunit-includes.patch
+++ b/erlang-riak_core-0004-Guard-all-unguarded-eunit-includes.patch
@@ -1,7 +1,7 @@
From 785e2714f75f16f1f6764161379256336d3b0da0 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/4] Guard all unguarded eunit includes
+Subject: [PATCH 4/5] Guard all unguarded eunit includes
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -54,5 +54,5 @@ index 3ee69d1..b78b63f 100644
-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.2
+1.7.10.4
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
new file mode 100644
index 0000000..d6bcffa
--- /dev/null
+++ b/erlang-riak_core-0005-Explicitly-export-riak_core_ring_manager-set_ring_gl.patch
@@ -0,0 +1,35 @@
+From 24dc9c5a44441424e226669fba3f4326bb0c7815 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
+ riak_core_ring_manager:set_ring_global/1
+ (Fedora-specific)
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ 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
+--- a/src/riak_core_ring_manager.erl
++++ b/src/riak_core_ring_manager.erl
+@@ -47,13 +47,14 @@
+ -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+ terminate/2, code_change/3]).
+
++-export([set_ring_global/1]).
++
+ -record(state, {
+ mode,
+ raw_ring
+ }).
+
+ -ifdef(TEST).
+--export([set_ring_global/1]).
+ -include_lib("eunit/include/eunit.hrl").
+ -endif.
+
+--
+1.7.10.4
+
diff --git a/erlang-riak_core.spec b/erlang-riak_core.spec
index 01d3d8e..aedb56b 100644
--- a/erlang-riak_core.spec
+++ b/erlang-riak_core.spec
@@ -7,7 +7,7 @@
Name: erlang-%{realname}
Version: 1.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Distributed systems infrastructure used by Riak
Group: Development/Languages
License: ASL 2.0
@@ -22,6 +22,8 @@ Patch2: erlang-riak_core-0002-global-safe_whereis_name-1-has-been-removed.patch
Patch3: erlang-riak_core-0003-remove-duplicated-include.patch
# Sent upstream - https://github.com/basho/riak_core/pull/188
Patch4: erlang-riak_core-0004-Guard-all-unguarded-eunit-includes.patch
+# Fedora/EPEL specific
+Patch5: erlang-riak_core-0005-Explicitly-export-riak_core_ring_manager-set_ring_gl.patch
# Required for unit-tests only (if you're not interested in a compile-time
# testing then you may remove these lines):
@@ -37,29 +39,29 @@ BuildRequires: erlang-rebar
BuildRequires: erlang-protobuffs
BuildRequires: erlang-webmachine
-Requires: erlang-basho_stats
-Requires: erlang-cluster_info
-Requires: erlang-crypto
+Requires: erlang-basho_stats%{?_isa}
+Requires: erlang-cluster_info%{?_isa}
+Requires: erlang-crypto%{?_isa}
# Error:erlang(erlang:atom_to_binary/2) in R12B and below
# Error:erlang(erlang:binary_to_atom/2) in R12B and below
# Error:erlang(erlang:max/2) in R12B and below
# Error:erlang(erlang:min/2) in R12B and below
# Error:erlang(lists:keyfind/3) in R12B and below
# Error:erlang(os:timestamp/0) in R12B and below
-Requires: erlang-erts >= R13B
-Requires: erlang-inets
-Requires: erlang-kernel
-Requires: erlang-lager
-Requires: erlang-mochiweb
-Requires: erlang-poolboy
-Requires: erlang-protobuffs
-Requires: erlang-riak_sysmon
-Requires: erlang-runtime_tools
+Requires: erlang-erts%{?_isa} >= R13B
+Requires: erlang-inets%{?_isa}
+Requires: erlang-kernel%{?_isa}
+Requires: erlang-lager%{?_isa}
+Requires: erlang-mochiweb%{?_isa}
+Requires: erlang-poolboy%{?_isa}
+Requires: erlang-protobuffs%{?_isa}
+Requires: erlang-riak_sysmon%{?_isa}
+Requires: erlang-runtime_tools%{?_isa}
# Error:erlang(ssl:ssl_accept/3) in R12B and below
-Requires: erlang-ssl >= R13B
+Requires: erlang-ssl%{?_isa} >= R13B
# Error:erlang(supervisor:count_children/1) in R12B and below
-Requires: erlang-stdlib >= R13B
-Requires: erlang-webmachine
+Requires: erlang-stdlib%{?_isa} >= R13B
+Requires: erlang-webmachine%{?_isa}
%description
@@ -72,6 +74,7 @@ Distributed systems infrastructure used by Riak.
%patch2 -p1 -b .r15b01
%patch3 -p1 -b .duplicated_unguarded_eunit_include
%patch4 -p1 -b .guard_all_eunit_include
+%patch5 -p1 -b .reexport
%build
@@ -99,6 +102,9 @@ rebar eunit -v
%changelog
+* Thu Jul 19 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.1.2-2
+- Re-export one handy function
+
* Fri May 18 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.1.2-1
- Ver. 1.1.2
More information about the scm-commits
mailing list