[erlang-riak_control] Ver. 1.2.1
Peter Lemenkov
peter at fedoraproject.org
Fri Oct 19 19:08:02 UTC 2012
commit 9c057417b0aea8d4455901d6923574edbe261e75
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Fri Oct 19 23:07:55 2012 +0400
Ver. 1.2.1
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
.gitignore | 1 +
...po-fix-no-such-function-gen_server-cast-3.patch | 8 +-
...xport-admin_ring-node_ring_details-2-back.patch | 20 ++--
erlang-riak_control-0003-Fix-includes.patch | 98 +++++++++++++++++---
...edora-specific-remove-rebar-explicit-deps.patch | 20 ++--
erlang-riak_control.spec | 23 +++--
sources | 2 +-
7 files changed, 123 insertions(+), 49 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 36efd72..00dea67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/basho-riak_control-0.1.2-0-gc7fd3a9.tar.gz
+/basho-riak_control-1.2.1-0-gef4ddb4.tar.gz
diff --git a/erlang-riak_control-0001-Typo-fix-no-such-function-gen_server-cast-3.patch b/erlang-riak_control-0001-Typo-fix-no-such-function-gen_server-cast-3.patch
index 2502957..e7d0cad 100644
--- a/erlang-riak_control-0001-Typo-fix-no-such-function-gen_server-cast-3.patch
+++ b/erlang-riak_control-0001-Typo-fix-no-such-function-gen_server-cast-3.patch
@@ -1,4 +1,4 @@
-From 413559fccf140da7e68cc0ebd79c4a296f814006 Mon Sep 17 00:00:00 2001
+From 125d07084b46461f8f794070670d11c83f615159 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Fri, 29 Jun 2012 16:05:10 +0400
Subject: [PATCH 1/4] Typo fix (no such function - gen_server:cast/3)
@@ -9,10 +9,10 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/riak_control_session.erl b/src/riak_control_session.erl
-index 4df63df..6b288a1 100644
+index cc551d9..2b34fcb 100644
--- a/src/riak_control_session.erl
+++ b/src/riak_control_session.erl
-@@ -84,7 +84,7 @@ get_partitions () ->
+@@ -88,7 +88,7 @@ get_partitions () ->
gen_server:call(?MODULE,get_partitions,infinity).
force_update () ->
@@ -22,5 +22,5 @@ index 4df63df..6b288a1 100644
%% ===================================================================
%% gen_server callbacks
--
-1.7.11.2
+1.7.12.1
diff --git a/erlang-riak_control-0002-Re-export-admin_ring-node_ring_details-2-back.patch b/erlang-riak_control-0002-Re-export-admin_ring-node_ring_details-2-back.patch
index afa4556..e457c7c 100644
--- a/erlang-riak_control-0002-Re-export-admin_ring-node_ring_details-2-back.patch
+++ b/erlang-riak_control-0002-Re-export-admin_ring-node_ring_details-2-back.patch
@@ -1,4 +1,4 @@
-From 59852eec8c72d2d9daacc3829548e35362d3c3de Mon Sep 17 00:00:00 2001
+From aee0f9c59ff802f9183ad14a9f1d6c300e26fe86 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Fri, 29 Jun 2012 16:13:42 +0400
Subject: [PATCH 2/4] Re-export admin_ring:node_ring_details/2 back
@@ -10,32 +10,30 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/admin_node.erl b/src/admin_node.erl
-index 9eabfca..4023562 100644
+index f12575e..abe5920 100644
--- a/src/admin_node.erl
+++ b/src/admin_node.erl
-@@ -87,7 +87,7 @@ get_node_details (Req,C) ->
+@@ -86,5 +86,5 @@ get_node_details(Req,C) ->
Node=target_node(Req),
{ok,Ring}=riak_core_ring_manager:get_my_ring(),
Indices=rpc:call(Node,riak_core_ring,my_indices,[Ring]),
- PS=[{struct,admin_ring:node_ring_details(Ring,{P,Node})} || P <- Indices],
+ PS=[{struct,admin_ring:node_ring_details(P,Node)} || P <- Indices],
{mochijson2:encode(PS),Req,C}.
-
- %% remote to the target node, perform the action, and return
diff --git a/src/admin_ring.erl b/src/admin_ring.erl
-index af06251..9b519db 100644
+index ef811b1..867fc4a 100644
--- a/src/admin_ring.erl
+++ b/src/admin_ring.erl
-@@ -24,7 +24,8 @@
- content_types_provided/2,
+@@ -25,7 +25,8 @@
to_json/2,
is_authorized/2,
-- service_available/2
-+ service_available/2,
+ service_available/2,
+- forbidden/2
++ forbidden/2,
+ node_ring_details/2
]).
%% riak_control and webmachine dependencies
--
-1.7.11.2
+1.7.12.1
diff --git a/erlang-riak_control-0003-Fix-includes.patch b/erlang-riak_control-0003-Fix-includes.patch
index 27fba05..4372a22 100644
--- a/erlang-riak_control-0003-Fix-includes.patch
+++ b/erlang-riak_control-0003-Fix-includes.patch
@@ -1,4 +1,4 @@
-From 3bfffd98433d72171856b0bdc31a7e88059f12f4 Mon Sep 17 00:00:00 2001
+From dde867867ee4942f3d8138f7c22c79aa09066512 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu, 26 Jul 2012 23:51:32 +0400
Subject: [PATCH 3/4] Fix includes
@@ -6,18 +6,62 @@ Subject: [PATCH 3/4] Fix includes
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
src/admin_cluster.erl | 2 +-
+ src/admin_cluster_down.erl | 2 +-
+ src/admin_cluster_join.erl | 2 +-
+ src/admin_fallbacks.erl | 2 +-
src/admin_gui.erl | 2 +-
src/admin_node.erl | 2 +-
+ src/admin_node_leave.erl | 2 +-
+ src/admin_node_stop.erl | 2 +-
src/admin_overview.erl | 2 +-
src/admin_ring.erl | 2 +-
src/riak_control_session.erl | 2 +-
- 6 files changed, 6 insertions(+), 6 deletions(-)
+ 11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/admin_cluster.erl b/src/admin_cluster.erl
-index 9fa4752..b3d18e9 100644
+index beaaf72..70c6fc0 100644
--- a/src/admin_cluster.erl
+++ b/src/admin_cluster.erl
-@@ -28,7 +28,7 @@
+@@ -29,7 +29,7 @@
+ ]).
+
+ %% riak_control and webmachine dependencies
+--include_lib("riak_control/include/riak_control.hrl").
++-include("../include/riak_control.hrl").
+ -include_lib("webmachine/include/webmachine.hrl").
+
+ %% mappings to the various content types supported for this resource
+diff --git a/src/admin_cluster_down.erl b/src/admin_cluster_down.erl
+index a971449..fce953c 100644
+--- a/src/admin_cluster_down.erl
++++ b/src/admin_cluster_down.erl
+@@ -29,7 +29,7 @@
+ ]).
+
+ %% riak_control and webmachine dependencies
+--include_lib("riak_control/include/riak_control.hrl").
++-include("../include/riak_control.hrl").
+ -include_lib("webmachine/include/webmachine.hrl").
+
+ %% mappings to the various content types supported for this resource
+diff --git a/src/admin_cluster_join.erl b/src/admin_cluster_join.erl
+index 50c33a8..cfe2a41 100644
+--- a/src/admin_cluster_join.erl
++++ b/src/admin_cluster_join.erl
+@@ -29,7 +29,7 @@
+ ]).
+
+ %% riak_control and webmachine dependencies
+--include_lib("riak_control/include/riak_control.hrl").
++-include("../include/riak_control.hrl").
+ -include_lib("webmachine/include/webmachine.hrl").
+
+ %% mappings to the various content types supported for this resource
+diff --git a/src/admin_fallbacks.erl b/src/admin_fallbacks.erl
+index 84d1eaa..51c4b3a 100644
+--- a/src/admin_fallbacks.erl
++++ b/src/admin_fallbacks.erl
+@@ -29,7 +29,7 @@
]).
%% riak_control and webmachine dependencies
@@ -27,7 +71,7 @@ index 9fa4752..b3d18e9 100644
%% mappings to the various content types supported for this resource
diff --git a/src/admin_gui.erl b/src/admin_gui.erl
-index eb2a534..aaef756 100644
+index ad60c9c..58fb3eb 100644
--- a/src/admin_gui.erl
+++ b/src/admin_gui.erl
@@ -31,7 +31,7 @@
@@ -40,10 +84,36 @@ index eb2a534..aaef756 100644
%% mappings to the various content types supported for this resource
diff --git a/src/admin_node.erl b/src/admin_node.erl
-index 4023562..f453262 100644
+index abe5920..05b7113 100644
--- a/src/admin_node.erl
+++ b/src/admin_node.erl
-@@ -28,7 +28,7 @@
+@@ -29,7 +29,7 @@
+ ]).
+
+ %% riak_control and webmachine dependencies
+--include_lib("riak_control/include/riak_control.hrl").
++-include("../include/riak_control.hrl").
+ -include_lib("webmachine/include/webmachine.hrl").
+
+ %% mappings to the various content types supported for this resource
+diff --git a/src/admin_node_leave.erl b/src/admin_node_leave.erl
+index bf759a2..e04f51e 100644
+--- a/src/admin_node_leave.erl
++++ b/src/admin_node_leave.erl
+@@ -29,7 +29,7 @@
+ ]).
+
+ %% riak_control and webmachine dependencies
+--include_lib("riak_control/include/riak_control.hrl").
++-include("../include/riak_control.hrl").
+ -include_lib("webmachine/include/webmachine.hrl").
+
+ %% mappings to the various content types supported for this resource
+diff --git a/src/admin_node_stop.erl b/src/admin_node_stop.erl
+index a5fecdb..32b464e 100644
+--- a/src/admin_node_stop.erl
++++ b/src/admin_node_stop.erl
+@@ -29,7 +29,7 @@
]).
%% riak_control and webmachine dependencies
@@ -53,10 +123,10 @@ index 4023562..f453262 100644
%% mappings to the various content types supported for this resource
diff --git a/src/admin_overview.erl b/src/admin_overview.erl
-index a658bc6..2f32143 100644
+index 7e23755..d5bc8f8 100644
--- a/src/admin_overview.erl
+++ b/src/admin_overview.erl
-@@ -28,7 +28,7 @@
+@@ -29,7 +29,7 @@
]).
%% riak_control and webmachine dependencies
@@ -66,10 +136,10 @@ index a658bc6..2f32143 100644
%% mappings to the various content types supported for this resource
diff --git a/src/admin_ring.erl b/src/admin_ring.erl
-index 9b519db..fb5664f 100644
+index 867fc4a..5ae3cae 100644
--- a/src/admin_ring.erl
+++ b/src/admin_ring.erl
-@@ -29,7 +29,7 @@
+@@ -30,7 +30,7 @@
]).
%% riak_control and webmachine dependencies
@@ -79,10 +149,10 @@ index 9b519db..fb5664f 100644
%% mappings to the various content types supported for this resource
diff --git a/src/riak_control_session.erl b/src/riak_control_session.erl
-index 6b288a1..8e75e65 100644
+index 2b34fcb..99e5cac 100644
--- a/src/riak_control_session.erl
+++ b/src/riak_control_session.erl
-@@ -44,7 +44,7 @@
+@@ -48,7 +48,7 @@
-export([get_my_info/0]).
%% record definitions
@@ -92,5 +162,5 @@ index 6b288a1..8e75e65 100644
-record(state,
{ vsn :: version(),
--
-1.7.11.2
+1.7.12.1
diff --git a/erlang-riak_control-0004-Fedora-specific-remove-rebar-explicit-deps.patch b/erlang-riak_control-0004-Fedora-specific-remove-rebar-explicit-deps.patch
index 9c99ce1..1c62d3d 100644
--- a/erlang-riak_control-0004-Fedora-specific-remove-rebar-explicit-deps.patch
+++ b/erlang-riak_control-0004-Fedora-specific-remove-rebar-explicit-deps.patch
@@ -1,28 +1,26 @@
-From 9f702d5da7aeb2de4a488598eef53c204dc1a0ab Mon Sep 17 00:00:00 2001
+From bd5e30a1008f8d5a6869d9425c38d86fea5c54ee Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat, 28 Jul 2012 22:32:58 +0400
Subject: [PATCH 4/4] Fedora-specific: remove rebar explicit deps
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
- rebar.config | 7 -------
- 1 file changed, 7 deletions(-)
+ rebar.config | 5 -----
+ 1 file changed, 5 deletions(-)
diff --git a/rebar.config b/rebar.config
-index 834f2c8..5b46ea0 100644
+index 1230dbf..5b46ea0 100644
--- a/rebar.config
+++ b/rebar.config
-@@ -2,10 +2,3 @@
+@@ -2,8 +2,3 @@
{erl_opts, [warnings_as_errors, debug_info]}.
{edoc_opts, [{preprocess, true}]}.
{cover_enabled, true}.
-{deps, [
-- {webmachine, "1.9.1",
-- {git, "git://github.com/basho/webmachine", {tag, "1.9.1"}}},
-- {riak_core, "1.1.2",
-- {git, "git://github.com/basho/riak_core", {tag, "1.1.2"}}}
+- {webmachine, "1.9.2", {git, "git://github.com/basho/webmachine", {tag, "1.9.2p1"}}},
+- {riak_core, "1.2.*", {git, "git://github.com/basho/riak_core", {tag, "1.2.1"}}},
+- {erlydtl, "0.7.0", {git, "git://github.com/evanmiller/erlydtl.git", {tag, "8411bacd"}}}
- ]}.
--
--
-1.7.11.2
+1.7.12.1
diff --git a/erlang-riak_control.spec b/erlang-riak_control.spec
index 320dcec..65b0afd 100644
--- a/erlang-riak_control.spec
+++ b/erlang-riak_control.spec
@@ -1,18 +1,18 @@
%global realname riak_control
%global upstream basho
%global debug_package %{nil}
-%global git_tag c7fd3a9
+%global git_tag ef4ddb4
%global patchnumber 0
Name: erlang-%{realname}
-Version: 0.1.2
-Release: 2%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
Summary: Admin UI for Riak
Group: Development/Languages
License: ASL 2.0
URL: https://github.com/basho/riak_control
-# wget --content-disposition https://github.com/basho/riak_control/tarball/0.1.2
+# wget --content-disposition https://github.com/basho/riak_control/tarball/1.2.1
Source0: %{upstream}-%{realname}-%{version}-%{patchnumber}-g%{git_tag}.tar.gz
# Sent upstream - https://github.com/basho/riak_control/pull/26
Patch1: %{name}-0001-Typo-fix-no-such-function-gen_server-cast-3.patch
@@ -25,6 +25,9 @@ Patch4: %{name}-0004-Fedora-specific-remove-rebar-explicit-deps.patch
BuildRequires: erlang-rebar
BuildRequires: erlang-riak_core
BuildRequires: erlang-webmachine
+Requires: erlang-crypto%{?_isa}
+Requires: erlang-erlydtl%{?_isa}
+# Error:erlang(binary:replace/4)
# 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
@@ -44,7 +47,7 @@ it in various ways.
%prep
-%setup -q -n %{upstream}-%{realname}-d5f714a
+%setup -q -n %{upstream}-%{realname}-82c362a
chmod 644 priv/admin/fonts/rokkitt-bold.woff
chmod 644 priv/admin/fonts/rokkitt.woff
%patch1 -p1 -b .typo
@@ -56,7 +59,7 @@ rm -f ./rebar
%build
-rebar -v compile
+rebar compile -v
%install
@@ -68,8 +71,9 @@ cp -ar priv/* %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/priv
%check
-# No tests are provided as for ver. 0.1.2
-#rebar eunit -v
+# In order to run tests we need a QuickCheck library which is proprietary
+# so no tests for 1.2.1 version.
+rebar eunit -v
%files
@@ -85,6 +89,9 @@ cp -ar priv/* %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/priv
%changelog
+* Fri Oct 19 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.2.1-1
+- Ver. 1.2.1
+
* Thu Jul 26 2012 Peter Lemenkov <lemenkov at gmail.com> - 0.1.2-2
- Fixed mixed macro usage in spec (mostly cosmetic change)
- Dropped remaining stuff required by EL5
diff --git a/sources b/sources
index 10ac1e3..4f8c238 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-798797f3ee9f413183d3a227f4051070 basho-riak_control-0.1.2-0-gc7fd3a9.tar.gz
+73defff003982fd85bcc4c37a7f0530d basho-riak_control-1.2.1-0-gef4ddb4.tar.gz
More information about the scm-commits
mailing list