[erlang-gproc] Ver. 0.2.13
Peter Lemenkov
peter at fedoraproject.org
Sat Jul 28 20:16:50 UTC 2012
commit cb59fe2a1a48b592b67c20f0cfb455dc591911ea
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun Jul 29 00:16:41 2012 +0400
Ver. 0.2.13
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
.gitignore | 1 +
...emove-explicit-rebar-deps-Fedora-specific.patch | 6 ++--
erlang-gproc-0002-Kill-useless-eunit-include.patch | 10 ++++----
...ction-lists-keyfind-3-in-R12B5-use-lists-.patch | 10 ++++----
erlang-gproc-0004-Missing-typedefs-in-R12B.patch | 18 ++++++++--------
...No-such-built-in-function-error-1-in-R12B.patch | 6 ++--
erlang-gproc-0006-No-such-ETS-option-in-R12B.patch | 14 ++++++------
...tarting-slaves-during-eunit-tests-on-R12B.patch | 8 +++---
...0008-Can-t-set-up-heap_size-R12B-specific.patch | 6 ++--
erlang-gproc.spec | 21 +++++++++++++------
sources | 2 +-
11 files changed, 55 insertions(+), 47 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8554ea4..e53d7b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/uwiger-gproc-f0807c9.tar.gz
/esl-gproc-v0.2.11-0-g781e0d0.tar.gz
+/esl-gproc-0.2.13-0-g9c08011.tar.gz
diff --git a/erlang-gproc-0001-Remove-explicit-rebar-deps-Fedora-specific.patch b/erlang-gproc-0001-Remove-explicit-rebar-deps-Fedora-specific.patch
index 2e3f69d..470797c 100644
--- a/erlang-gproc-0001-Remove-explicit-rebar-deps-Fedora-specific.patch
+++ b/erlang-gproc-0001-Remove-explicit-rebar-deps-Fedora-specific.patch
@@ -1,4 +1,4 @@
-From c1b7451cb141d1d8e4345cfd20da820a591606a1 Mon Sep 17 00:00:00 2001
+From af405f376fbb45028e55bb695771560272420166 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue, 15 May 2012 17:31:31 +0400
Subject: [PATCH 1/8] Remove explicit rebar deps (Fedora-specific)
@@ -11,7 +11,7 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
1 file changed, 5 deletions(-)
diff --git a/rebar.config b/rebar.config
-index 2a7424d..5f1240d 100644
+index 3c9cd7d..01c32d6 100644
--- a/rebar.config
+++ b/rebar.config
@@ -1,10 +1,5 @@
@@ -26,5 +26,5 @@ index 2a7424d..5f1240d 100644
no_improper_lists, no_fun_app, no_match,
no_opaque, no_fail_call,
--
-1.7.10.2
+1.7.10.4
diff --git a/erlang-gproc-0002-Kill-useless-eunit-include.patch b/erlang-gproc-0002-Kill-useless-eunit-include.patch
index 941f8b8..15d3ffe 100644
--- a/erlang-gproc-0002-Kill-useless-eunit-include.patch
+++ b/erlang-gproc-0002-Kill-useless-eunit-include.patch
@@ -1,4 +1,4 @@
-From e6653099cd1a63310e6077d9ebec3181ebfd238f Mon Sep 17 00:00:00 2001
+From 09dda18fd8b444014e3b8f7047285b5b95438b11 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat, 26 May 2012 20:08:38 +0400
Subject: [PATCH 2/8] Kill useless eunit include
@@ -9,17 +9,17 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
1 file changed, 1 deletion(-)
diff --git a/src/gproc.erl b/src/gproc.erl
-index 0f5870c..54c6d36 100644
+index afa56fe..80617df 100644
--- a/src/gproc.erl
+++ b/src/gproc.erl
-@@ -131,7 +131,6 @@
-
+@@ -152,7 +152,6 @@
+ -include("gproc_int.hrl").
-include("gproc.hrl").
--include_lib("eunit/include/eunit.hrl").
-define(SERVER, ?MODULE).
%%-define(l, l(?LINE)). % when activated, calls a traceable empty function
--
-1.7.10.2
+1.7.10.4
diff --git a/erlang-gproc-0003-No-such-function-lists-keyfind-3-in-R12B5-use-lists-.patch b/erlang-gproc-0003-No-such-function-lists-keyfind-3-in-R12B5-use-lists-.patch
index 67517d1..1c45a2a 100644
--- a/erlang-gproc-0003-No-such-function-lists-keyfind-3-in-R12B5-use-lists-.patch
+++ b/erlang-gproc-0003-No-such-function-lists-keyfind-3-in-R12B5-use-lists-.patch
@@ -1,4 +1,4 @@
-From 989643f0768c0ebddd1c842943b732510f054b14 Mon Sep 17 00:00:00 2001
+From 5d3e3e89371a76cc7b46111ae17da2341ab56651 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu, 31 May 2012 23:09:05 +0400
Subject: [PATCH 3/8] No such function lists:keyfind/3 in R12B5 - use
@@ -11,10 +11,10 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/gproc_dist.erl b/src/gproc_dist.erl
-index dc45f41..69d7717 100644
+index 743f7c3..fab0a9e 100644
--- a/src/gproc_dist.erl
+++ b/src/gproc_dist.erl
-@@ -367,14 +367,14 @@ handle_leader_call(_, _, S, _E) ->
+@@ -479,14 +479,14 @@ handle_leader_call(_, _, S, _E) ->
handle_leader_cast({sync_reply, Node, Ref}, S, _E) ->
#state{sync_requests = SReqs} = S,
@@ -32,7 +32,7 @@ index dc45f41..69d7717 100644
[] ->
gen_leader:reply(Ref, {leader, reply, true}),
diff --git a/test/gproc_tests.erl b/test/gproc_tests.erl
-index 776a2b7..cda92aa 100644
+index ee5485c..0542fd4 100644
--- a/test/gproc_tests.erl
+++ b/test/gproc_tests.erl
@@ -50,8 +50,8 @@ t_ets_opts() ->
@@ -47,5 +47,5 @@ index 776a2b7..cda92aa 100644
error(timeout)
end.
--
-1.7.10.2
+1.7.10.4
diff --git a/erlang-gproc-0004-Missing-typedefs-in-R12B.patch b/erlang-gproc-0004-Missing-typedefs-in-R12B.patch
index b03b970..09d49ad 100644
--- a/erlang-gproc-0004-Missing-typedefs-in-R12B.patch
+++ b/erlang-gproc-0004-Missing-typedefs-in-R12B.patch
@@ -1,4 +1,4 @@
-From c3ad6a09ee05011eb8af8dae77228cae4c77f636 Mon Sep 17 00:00:00 2001
+From 1cdd5f8c4596cc54f57d1fb0aad06038740ff535 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Fri, 1 Jun 2012 13:49:39 +0400
Subject: [PATCH 4/8] Missing typedefs in R12B
@@ -13,10 +13,10 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/gproc.erl b/src/gproc.erl
-index 54c6d36..7d0174d 100644
+index 80617df..6167d41 100644
--- a/src/gproc.erl
+++ b/src/gproc.erl
-@@ -934,7 +934,7 @@ lookup_pids({T,_,_} = Key) ->
+@@ -1372,7 +1372,7 @@ lookup_pids({T,_,_} = Key) ->
[P || P <- L, my_is_process_alive(P)].
@@ -26,19 +26,19 @@ index 54c6d36..7d0174d 100644
my_is_process_alive(P) when node(P) =:= node() ->
is_process_alive(P);
diff --git a/src/gproc_lib.erl b/src/gproc_lib.erl
-index a9fbefc..8f11390 100644
+index 822fb4d..d670ef9 100644
--- a/src/gproc_lib.erl
+++ b/src/gproc_lib.erl
-@@ -42,7 +42,7 @@
+@@ -49,7 +49,7 @@
%% Pid around as payload as well. This is a bit redundant, but
%% symmetric.
%%
---spec insert_reg(key(), any(), pid(), scope()) -> boolean().
-+-spec insert_reg(key(), any(), pid(), scope()) -> bool().
+--spec insert_reg(key(), any(), pid() | shared, scope()) -> boolean().
++-spec insert_reg(key(), any(), pid() | shared, scope()) -> bool().
insert_reg({T,_,Name} = K, Value, Pid, Scope) when T==a; T==n ->
MaybeScan = fun() ->
-@@ -168,7 +168,7 @@ maybe_waiters(K, Pid, Value, T, Info) ->
+@@ -175,7 +175,7 @@ maybe_waiters(K, Pid, Value, T, Info) ->
end.
@@ -48,5 +48,5 @@ index a9fbefc..8f11390 100644
notify_waiters(Waiters, K, Pid, V) ->
_ = [begin
--
-1.7.10.2
+1.7.10.4
diff --git a/erlang-gproc-0005-No-such-built-in-function-error-1-in-R12B.patch b/erlang-gproc-0005-No-such-built-in-function-error-1-in-R12B.patch
index a097181..e2c8f24 100644
--- a/erlang-gproc-0005-No-such-built-in-function-error-1-in-R12B.patch
+++ b/erlang-gproc-0005-No-such-built-in-function-error-1-in-R12B.patch
@@ -1,4 +1,4 @@
-From b5fab9306b36aa7d274e0493126e7503b071c544 Mon Sep 17 00:00:00 2001
+From 4eea0cceb7aaa95029eea6fd814517908717fa10 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Fri, 1 Jun 2012 13:59:46 +0400
Subject: [PATCH 5/8] No such built-in function - error/1 in R12B
@@ -9,7 +9,7 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/gproc_tests.erl b/test/gproc_tests.erl
-index cda92aa..1f0645d 100644
+index 0542fd4..b97d9df 100644
--- a/test/gproc_tests.erl
+++ b/test/gproc_tests.erl
@@ -53,7 +53,7 @@ t_ets_opts() ->
@@ -22,5 +22,5 @@ index cda92aa..1f0645d 100644
--
-1.7.10.2
+1.7.10.4
diff --git a/erlang-gproc-0006-No-such-ETS-option-in-R12B.patch b/erlang-gproc-0006-No-such-ETS-option-in-R12B.patch
index ce092f9..d8a55ae 100644
--- a/erlang-gproc-0006-No-such-ETS-option-in-R12B.patch
+++ b/erlang-gproc-0006-No-such-ETS-option-in-R12B.patch
@@ -1,4 +1,4 @@
-From 2c831f091a085c6719da6150e2ff6db81f326e67 Mon Sep 17 00:00:00 2001
+From d310eb67bac45fd4d81516e7a9b972431c2bdf72 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Fri, 1 Jun 2012 18:05:10 +0400
Subject: [PATCH 6/8] No such ETS option in R12B
@@ -11,10 +11,10 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/gproc.erl b/src/gproc.erl
-index 7d0174d..81fb477 100644
+index 6167d41..63095b6 100644
--- a/src/gproc.erl
+++ b/src/gproc.erl
-@@ -1437,11 +1437,9 @@ pid_to_give_away_to({T,l,_} = Key) when T==n; T==a ->
+@@ -2139,11 +2139,9 @@ pid_to_give_away_to({T,l,_} = Key) when T==n; T==a ->
end.
create_tabs() ->
@@ -28,10 +28,10 @@ index 7d0174d..81fb477 100644
ok
end.
diff --git a/src/gproc_lib.erl b/src/gproc_lib.erl
-index 8f11390..54e28fd 100644
+index d670ef9..9ba0fdf 100644
--- a/src/gproc_lib.erl
+++ b/src/gproc_lib.erl
-@@ -287,8 +287,6 @@ check_opts(Type, Other) ->
+@@ -430,8 +430,6 @@ check_opts(Type, Other) ->
check_option_f(ets_options) -> fun check_ets_option/1;
check_option_f(server_options) -> fun check_server_option/1.
@@ -41,7 +41,7 @@ index 8f11390..54e28fd 100644
check_server_option({priority, P}) ->
diff --git a/test/gproc_tests.erl b/test/gproc_tests.erl
-index 1f0645d..215d05e 100644
+index b97d9df..baaae3c 100644
--- a/test/gproc_tests.erl
+++ b/test/gproc_tests.erl
@@ -43,14 +43,14 @@ t_server_opts() ->
@@ -62,5 +62,5 @@ index 1f0645d..215d05e 100644
after 3000 ->
erlang:error(timeout)
--
-1.7.10.2
+1.7.10.4
diff --git a/erlang-gproc-0007-Fix-starting-slaves-during-eunit-tests-on-R12B.patch b/erlang-gproc-0007-Fix-starting-slaves-during-eunit-tests-on-R12B.patch
index 2eb8a2c..0c2229e 100644
--- a/erlang-gproc-0007-Fix-starting-slaves-during-eunit-tests-on-R12B.patch
+++ b/erlang-gproc-0007-Fix-starting-slaves-during-eunit-tests-on-R12B.patch
@@ -1,4 +1,4 @@
-From 76f9e8d557483985c135c7a91c64fe36eb97b8f8 Mon Sep 17 00:00:00 2001
+From db5bc20ee487481e21c65e24a84b44beeb9f4968 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Fri, 1 Jun 2012 18:57:06 +0400
Subject: [PATCH 7/8] Fix starting slaves during eunit tests on R12B
@@ -9,10 +9,10 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/gproc_dist_tests.erl b/test/gproc_dist_tests.erl
-index c68482b..4a75016 100644
+index 6f54604..9c9037b 100644
--- a/test/gproc_dist_tests.erl
+++ b/test/gproc_dist_tests.erl
-@@ -294,7 +294,7 @@ start_slave(Name) ->
+@@ -478,7 +478,7 @@ start_slave(Name) ->
case node() of
nonode at nohost ->
os:cmd("epmd -daemon"),
@@ -22,5 +22,5 @@ index c68482b..4a75016 100644
ok
end,
--
-1.7.10.2
+1.7.10.4
diff --git a/erlang-gproc-0008-Can-t-set-up-heap_size-R12B-specific.patch b/erlang-gproc-0008-Can-t-set-up-heap_size-R12B-specific.patch
index 7126c86..0c1ca1f 100644
--- a/erlang-gproc-0008-Can-t-set-up-heap_size-R12B-specific.patch
+++ b/erlang-gproc-0008-Can-t-set-up-heap_size-R12B-specific.patch
@@ -1,4 +1,4 @@
-From 6ad10793948081e6afa85e9f196bda9ff81bdebf Mon Sep 17 00:00:00 2001
+From 87c3dfc249e0a2b8c6a1720faf456cc5834c025d Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Fri, 1 Jun 2012 23:04:21 +0400
Subject: [PATCH 8/8] Can't set up heap_size (R12B-specific)
@@ -9,7 +9,7 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/test/gproc_tests.erl b/test/gproc_tests.erl
-index 215d05e..0b5b384 100644
+index baaae3c..50f7e1f 100644
--- a/test/gproc_tests.erl
+++ b/test/gproc_tests.erl
@@ -30,15 +30,7 @@ conf_test_() ->
@@ -30,5 +30,5 @@ index 215d05e..0b5b384 100644
t_ets_opts() ->
%% Cannot inspect the write_concurrency attribute on an ets table in
--
-1.7.10.2
+1.7.10.4
diff --git a/erlang-gproc.spec b/erlang-gproc.spec
index 5824d2e..a8b2a64 100644
--- a/erlang-gproc.spec
+++ b/erlang-gproc.spec
@@ -1,19 +1,19 @@
%global realname gproc
%global debug_package %{nil}
%global upstream esl
-%global git_tag 781e0d0
+%global git_tag 9c08011
%global patchnumber 0
Name: erlang-%{realname}
-Version: 0.2.11
-Release: 4%{?dist}
+Version: 0.2.13
+Release: 1%{?dist}
Summary: Extended process registry for Erlang
Group: Development/Libraries
License: ERPL
URL: http://github.com/uwiger/gproc
-# wget --content-disposition https://github.com/esl/gproc/tarball/v0.2.11
-Source0: %{upstream}-%{realname}-v%{version}-%{patchnumber}-g%{git_tag}.tar.gz
+# wget --no-check-certificate --content-disposition https://github.com/esl/gproc/tarball/0.2.13
+Source0: %{upstream}-%{realname}-%{version}-%{patchnumber}-g%{git_tag}.tar.gz
Patch1: erlang-gproc-0001-Remove-explicit-rebar-deps-Fedora-specific.patch
Patch2: erlang-gproc-0002-Kill-useless-eunit-include.patch
Patch3: erlang-gproc-0003-No-such-function-lists-keyfind-3-in-R12B5-use-lists-.patch
@@ -28,7 +28,10 @@ BuildRequires: erlang-erts
BuildRequires: erlang-eunit
BuildRequires: erlang-gen_leader
BuildRequires: erlang-rebar
-Requires: erlang-erts%{?_isa} >= R12B
+# Error:erlang(erlang:min/2) in R12B and below
+# Error:erlang(ets:give_away/3) in R12B and below
+# Error:erlang(lists:keyfind/3) in R12B and below
+Requires: erlang-erts%{?_isa} >= R13B
Requires: erlang-gen_leader%{?_isa}
Requires: erlang-kernel%{?_isa}
Requires: erlang-mnesia%{?_isa}
@@ -40,7 +43,7 @@ Extended process registry for Erlang.
%prep
-%setup -q -n %{upstream}-%{realname}-d58b254
+%setup -q -n %{upstream}-%{realname}-%{git_tag}
%patch1 -p1 -b .nodeps
%patch2 -p1 -b .no_eunit
%if 0%{?el5}
@@ -52,6 +55,7 @@ Extended process registry for Erlang.
#%patch7 -p1 -b .fix_slaves
%patch8 -p1 -b .cant_setup_heap_size
%endif
+sed -i -e "s,git,\"%{version}\",g" src/gproc.app.src
%build
@@ -95,6 +99,9 @@ rebar eunit -v
%changelog
+* Sun Jul 29 2012 Peter Lemenkov <lemenkov at gmail.com> - 0.2.13-1
+- Ver. 0.2.13
+
* Sat Jul 28 2012 Peter Lemenkov <lemenkov at gmail.com> - 0.2.11-4
- Another bunch of fixes for R12B
diff --git a/sources b/sources
index 42ed4fc..8f2f954 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a8e36f3bb08fbcec02d696f983157881 esl-gproc-v0.2.11-0-g781e0d0.tar.gz
+c9183421d7bf5be5bfd595359aacfa70 esl-gproc-0.2.13-0-g9c08011.tar.gz
More information about the scm-commits
mailing list