[riak] Ver. 1.3.1
Peter Lemenkov
peter at fedoraproject.org
Sun Apr 7 08:01:50 UTC 2013
commit aca737a47619edea8fdb54929e7636ea7137fe77
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun Apr 7 12:01:37 2013 +0400
Ver. 1.3.1
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
.gitignore | 1 +
...o-install-dependencies-Fedora-EPEL-specif.patch | 45 ------------
... riak-0001-Rename-basho-patches-directory.patch | 16 ++--
...Don-t-require-specific-Erlang-OTP-version.patch | 26 +++++++
riak-0003-Relax-version-deps.patch | 28 +++++++
...-Temporarily-disable-lager_syslog-backend.patch | 55 ++++++++++++++
riak-0005-TEMPORARY-disable-riaknostic.patch | 70 ++++++++++++++++++
riak-0006-Remove-additional-search-paths.patch | 26 +++++++
riak.spec | 75 +++++++++++++-------
sources | 2 +-
10 files changed, 263 insertions(+), 81 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 148de8a..f3df34a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/basho-riak-riak-1.1.4-0-g95c5cb6.tar.gz
/riak-1.2.1.tar.gz
+/basho-riak-riak-1.3.1-0-g66706a0.tar.gz
diff --git a/riak-0002-Rename-basho-patches-directory.patch b/riak-0001-Rename-basho-patches-directory.patch
similarity index 66%
rename from riak-0002-Rename-basho-patches-directory.patch
rename to riak-0001-Rename-basho-patches-directory.patch
index 148cd47..d417e60 100644
--- a/riak-0002-Rename-basho-patches-directory.patch
+++ b/riak-0001-Rename-basho-patches-directory.patch
@@ -1,18 +1,18 @@
-From f60893b8cb88b43111f4fe3ea1f4d34fed7c9ac2 Mon Sep 17 00:00:00 2001
-From: Fedora Build <lemenkov at gmail.com>
-Date: Mon, 13 Aug 2012 14:57:19 +0400
-Subject: [PATCH 2/2] Rename basho-patches directory
+From 9a5d515a3385583f9aed305427e110d3d3aeaa40 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Sun, 24 Mar 2013 19:14:56 +0400
+Subject: [PATCH 1/6] Rename basho-patches directory
-Signed-off-by: Fedora Build <lemenkov at gmail.com>
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
rel/reltool.config | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rel/reltool.config b/rel/reltool.config
-index 5154fbd..ac7928c 100644
+index 2fdfcb0..1399e33 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
-@@ -73,6 +73,6 @@
+@@ -74,6 +74,6 @@
{template, "files/vm.args", "etc/vm.args"},
{template, "files/cert.pem", "etc/cert.pem"},
{template, "files/key.pem", "etc/key.pem"},
@@ -22,5 +22,5 @@ index 5154fbd..ac7928c 100644
+ {copy, "../ebin/etop_txt.beam", "lib/riak-1.2.1/ebin"}
]}.
--
-1.8.0
+1.8.2
diff --git a/riak-0002-Don-t-require-specific-Erlang-OTP-version.patch b/riak-0002-Don-t-require-specific-Erlang-OTP-version.patch
new file mode 100644
index 0000000..1014144
--- /dev/null
+++ b/riak-0002-Don-t-require-specific-Erlang-OTP-version.patch
@@ -0,0 +1,26 @@
+From 9230035d3126d5e3ec384b908ce405e5a33a9883 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Sun, 24 Mar 2013 19:55:40 +0400
+Subject: [PATCH 2/6] Don't require specific Erlang/OTP version
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ rebar.config | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/rebar.config b/rebar.config
+index 0e74593..1fac886 100644
+--- a/rebar.config
++++ b/rebar.config
+@@ -1,8 +1,6 @@
+ %% -*- mode: erlang -*-
+ {sub_dirs, ["rel"]}.
+
+-{require_otp_vsn, "R14B0[234]|R15"}.
+-
+ {cover_enabled, true}.
+
+ {lib_dirs, ["deps", "deps/riak_search/apps/"]}.
+--
+1.8.2
+
diff --git a/riak-0003-Relax-version-deps.patch b/riak-0003-Relax-version-deps.patch
new file mode 100644
index 0000000..bb65786
--- /dev/null
+++ b/riak-0003-Relax-version-deps.patch
@@ -0,0 +1,28 @@
+From 9cc089faf48c313bd6ae1c1303005fbbd628f34e Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Sat, 6 Apr 2013 10:50:04 +0400
+Subject: [PATCH 3/6] Relax version deps
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ rebar.config | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/rebar.config b/rebar.config
+index 1fac886..68b3d88 100644
+--- a/rebar.config
++++ b/rebar.config
+@@ -11,8 +11,8 @@
+ {lager_syslog, "1.2.2", {git, "git://github.com/basho/lager_syslog", {tag, "1.2.2"}}},
+ {cluster_info, "1.2.3", {git, "git://github.com/basho/cluster_info", {tag, "1.2.3"}}},
+ {riak_kv, "1.3.1", {git, "git://github.com/basho/riak_kv", {tag, "1.3.1"}}},
+- {riak_search, "1.3.0", {git, "git://github.com/basho/riak_search",
++ {riak_search, "1.3.*", {git, "git://github.com/basho/riak_search",
+ {tag, "1.3.1"}}},
+- {riak_control, "1.3.0", {git, "git://github.com/basho/riak_control", {tag, "1.3.1"}}},
++ {riak_control, "1.3.*", {git, "git://github.com/basho/riak_control", {tag, "1.3.1"}}},
+ {riaknostic, "1.1.0", {git, "git://github.com/basho/riaknostic", {tag, "v1.1.0"}}}
+ ]}.
+--
+1.8.2
+
diff --git a/riak-0004-Temporarily-disable-lager_syslog-backend.patch b/riak-0004-Temporarily-disable-lager_syslog-backend.patch
new file mode 100644
index 0000000..c959872
--- /dev/null
+++ b/riak-0004-Temporarily-disable-lager_syslog-backend.patch
@@ -0,0 +1,55 @@
+From 79b3d2a2aa0148d5f574f7b34d6d66e4f873f78d Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Sat, 6 Apr 2013 10:52:17 +0400
+Subject: [PATCH 4/6] Temporarily disable lager_syslog backend
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ rebar.config | 1 -
+ rel/files/app.config | 4 ----
+ rel/reltool.config | 2 --
+ 3 files changed, 7 deletions(-)
+
+diff --git a/rebar.config b/rebar.config
+index 68b3d88..84e8e18 100644
+--- a/rebar.config
++++ b/rebar.config
+@@ -8,7 +8,6 @@
+ {erl_opts, [debug_info, fail_on_warning]}.
+
+ {deps, [
+- {lager_syslog, "1.2.2", {git, "git://github.com/basho/lager_syslog", {tag, "1.2.2"}}},
+ {cluster_info, "1.2.3", {git, "git://github.com/basho/cluster_info", {tag, "1.2.3"}}},
+ {riak_kv, "1.3.1", {git, "git://github.com/basho/riak_kv", {tag, "1.3.1"}}},
+ {riak_search, "1.3.*", {git, "git://github.com/basho/riak_search",
+diff --git a/rel/files/app.config b/rel/files/app.config
+index c3d61b4..d86fe47 100644
+--- a/rel/files/app.config
++++ b/rel/files/app.config
+@@ -243,10 +243,6 @@
+ %% and the rotation time to "", or instead specify a 2-tuple that only
+ %% consists of {Logfile, Level}.
+ %%
+- %% If you wish to have riak log messages to syslog, you can use a handler
+- %% like this:
+- %% {lager_syslog_backend, ["riak", daemon, info]},
+- %%
+ {handlers, {{lager_handlers}} },
+
+ %% Whether to write a crash log, and where.
+diff --git a/rel/reltool.config b/rel/reltool.config
+index 1399e33..6147a25 100644
+--- a/rel/reltool.config
++++ b/rel/reltool.config
+@@ -49,8 +49,6 @@
+ {app, riak_search, [{incl_cond, include}]},
+ {app, eper, [{incl_cond, include}]},
+ {app, sasl, [{incl_cond, include}]},
+- {app, syslog, [{incl_cond, include}]},
+- {app, lager_syslog, [{incl_cond, include}]},
+ {app, lager, [{incl_cond, include}]},
+ {app, riak_control, [{incl_cond, include}]},
+ {app, riak_api, [{incl_cond, include}]},
+--
+1.8.2
+
diff --git a/riak-0005-TEMPORARY-disable-riaknostic.patch b/riak-0005-TEMPORARY-disable-riaknostic.patch
new file mode 100644
index 0000000..37fb94d
--- /dev/null
+++ b/riak-0005-TEMPORARY-disable-riaknostic.patch
@@ -0,0 +1,70 @@
+From bc39bb94fd842efa567731460bd76e05de9e3254 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Sat, 6 Apr 2013 11:53:26 +0400
+Subject: [PATCH 5/6] TEMPORARY disable riaknostic
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ Makefile | 18 ++----------------
+ rebar.config | 3 +--
+ 2 files changed, 3 insertions(+), 18 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 1de5cee..f4164de 100644
+--- a/Makefile
++++ b/Makefile
+@@ -39,24 +39,12 @@ test: deps compile testclean
+ ##
+ ## Release targets
+ ##
+-rel: deps compile generate riaknostic-rel
++rel: deps compile generate
+
+ relclean:
+ rm -rf rel/riak
+
+ ##
+-## Riaknostic targets
+-##
+-riaknostic: deps
+- $(MAKE) -C deps/riaknostic -f Makefile
+-
+-riaknostic-rel: riaknostic
+- rm -rf rel/riak/lib/riaknostic
+- mkdir -p rel/riak/lib/riaknostic
+- cp -f deps/riaknostic/riaknostic rel/riak/lib/riaknostic/
+-
+-
+-##
+ ## Developer targets
+ ##
+ ## devN - Make a dev build for node N
+@@ -76,12 +64,10 @@ SEQ = $(shell awk 'BEGIN { for (i = 1; i < '$(DEVNODES)'; i++) printf("%i ", i);
+ $(eval stagedevrel : $(foreach n,$(SEQ),stagedev$(n)))
+ $(eval devrel : $(foreach n,$(SEQ),dev$(n)))
+
+-dev% : all riaknostic
++dev% : all
+ mkdir -p dev
+ rel/gen_dev $@ rel/vars/dev_vars.config.src rel/vars/$@_vars.config
+ (cd rel && ../rebar generate target_dir=../dev/$@ overlay_vars=vars/$@_vars.config)
+- mkdir -p dev/$@/lib/riaknostic
+- cp -f deps/riaknostic/riaknostic dev/$@/lib/riaknostic/
+
+ stagedev% : dev%
+ $(foreach dep,$(wildcard deps/*), rm -rf dev/$^/lib/$(shell basename $(dep))* && ln -sf $(abspath $(dep)) dev/$^/lib;)
+diff --git a/rebar.config b/rebar.config
+index 84e8e18..72980d4 100644
+--- a/rebar.config
++++ b/rebar.config
+@@ -12,6 +12,5 @@
+ {riak_kv, "1.3.1", {git, "git://github.com/basho/riak_kv", {tag, "1.3.1"}}},
+ {riak_search, "1.3.*", {git, "git://github.com/basho/riak_search",
+ {tag, "1.3.1"}}},
+- {riak_control, "1.3.*", {git, "git://github.com/basho/riak_control", {tag, "1.3.1"}}},
+- {riaknostic, "1.1.0", {git, "git://github.com/basho/riaknostic", {tag, "v1.1.0"}}}
++ {riak_control, "1.3.*", {git, "git://github.com/basho/riak_control", {tag, "1.3.1"}}}
+ ]}.
+--
+1.8.2
+
diff --git a/riak-0006-Remove-additional-search-paths.patch b/riak-0006-Remove-additional-search-paths.patch
new file mode 100644
index 0000000..ebb3dc3
--- /dev/null
+++ b/riak-0006-Remove-additional-search-paths.patch
@@ -0,0 +1,26 @@
+From 6b48e8b962010d3c2653c486a39b221b728352d1 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Sat, 6 Apr 2013 20:43:38 +0400
+Subject: [PATCH 6/6] Remove additional search paths
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ rel/reltool.config | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rel/reltool.config b/rel/reltool.config
+index 6147a25..d4ffe09 100644
+--- a/rel/reltool.config
++++ b/rel/reltool.config
+@@ -1,7 +1,7 @@
+ %% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*-
+ %% ex: ft=erlang ts=4 sw=4 et
+ {sys, [
+- {lib_dirs, ["../deps", "../deps/riak_search/apps"]},
++ {lib_dirs, []},
+ {rel, "riak", "1.3.1",
+ [
+ kernel,
+--
+1.8.2
+
diff --git a/riak.spec b/riak.spec
index b03e855..4765670 100644
--- a/riak.spec
+++ b/riak.spec
@@ -1,55 +1,66 @@
+%global realname riak
+%global upstream basho
%global debug_package %{nil}
-%global ertsver 5.9.2
+%global git_tag 66706a0
+%global patchnumber 0
+
+
+%global ertsver %(%{_libdir}/erlang/bin/erl -noshell -eval 'io:format("~s", [erlang:system_info(version)]), halt().')
Name: riak
-Version: 1.2.1
-Release: 2%{?dist}
+Version: 1.3.1
+Release: 1%{?dist}
Summary: Dynamo-inspired key/value store
Group: Applications/Databases
License: ASL 2.0
URL: http://wiki.basho.com/Riak.html
-Source0: https://github.com/basho/riak/archive/%{name}-%{version}.tar.gz
+# wget --content-disposition https://github.com/basho/riak/tarball/riak-1.3.1
+Source0: %{upstream}-%{realname}-riak-%{version}-%{patchnumber}-g%{git_tag}.tar.gz
Source1: %{name}.tmpfiles.conf
Source2: %{name}.init
Source3: %{name}.service
-Patch1: %{name}-0001-Don-t-try-to-install-dependencies-Fedora-EPEL-specif.patch
-Patch2: %{name}-0002-Rename-basho-patches-directory.patch
+Patch1: %{name}-0001-Rename-basho-patches-directory.patch
+Patch2: %{name}-0002-Don-t-require-specific-Erlang-OTP-version.patch
+Patch3: %{name}-0003-Relax-version-deps.patch
+Patch4: %{name}-0004-Temporarily-disable-lager_syslog-backend.patch
+Patch5: %{name}-0005-TEMPORARY-disable-riaknostic.patch
+Patch6: %{name}-0006-Remove-additional-search-paths.patch
BuildRequires: erlang-rebar
BuildRequires: erlang-cluster_info
+BuildRequires: erlang-ebloom
BuildRequires: erlang-eper
BuildRequires: erlang-riak_control
BuildRequires: erlang-riak_kv
BuildRequires: erlang-riak_search
-Requires: erlang-basho_stats%{?_isa} = 1.0.2
+Requires: erlang-basho_stats%{?_isa} = %(rpm -q --queryformat %{VERSION} erlang-basho_stats)
Requires: erlang-bear%{?_isa}
-Requires: erlang-bitcask%{?_isa} = 1.5.2
-Requires: erlang-cluster_info%{?_isa} = 1.2.2
+Requires: erlang-bitcask%{?_isa} >= 1.6.0
+Requires: erlang-cluster_info%{?_isa} = %(rpm -q --queryformat %{VERSION} erlang-cluster_info)
Requires: erlang-ebloom%{?_isa}
-Requires: erlang-eleveldb%{?_isa} = 1.2.2
+Requires: erlang-eleveldb%{?_isa} = %(rpm -q --queryformat %{VERSION} erlang-eleveldb)
Requires: erlang-eper%{?_isa}
Requires: erlang-erlydtl%{?_isa}
Requires: erlang-folsom%{?_isa}
-Requires: erlang-js%{?_isa} = 1.2.1
-Requires: erlang-lager%{?_isa} = 1.2.1
-Requires: erlang-luke%{?_isa} = 0.2.5
+Requires: erlang-js%{?_isa}
+Requires: erlang-lager%{?_isa} = %(rpm -q --queryformat %{VERSION} erlang-lager)
# FIXME - I'll add luwak backend later
#Requires: erlang-luwak%{?_isa}
-Requires: erlang-merge_index%{?_isa} = 1.2.1
+Requires: erlang-merge_index%{?_isa} = %(rpm -q --queryformat %{VERSION} erlang-merge_index)
Requires: erlang-mochiweb%{?_isa}
Requires: erlang-poolboy%{?_isa}
Requires: erlang-protobuffs%{?_isa}
-Requires: erlang-riak_api%{?_isa} = 1.2.1
-Requires: erlang-riak_control%{?_isa} = 1.2.1
-Requires: erlang-riak_core%{?_isa} = 1.2.1
-Requires: erlang-riak_err%{?_isa} = 1.0.1
-Requires: erlang-riak_kv%{?_isa} = 1.2.1
-Requires: erlang-riak_pb%{?_isa} = 1.2.0
-Requires: erlang-riak_pipe%{?_isa} = 1.2.1
-Requires: erlang-riak_search%{?_isa} = 1.2.1
-Requires: erlang-riak_sysmon%{?_isa} = 1.1.2
-Requires: erlang-sext%{?_isa}
+Requires: erlang-riak_api%{?_isa} = %(rpm -q --queryformat %{VERSION} erlang-riak_api)
+Requires: erlang-riak_control%{?_isa} = %(rpm -q --queryformat %{VERSION} erlang-riak_control)
+Requires: erlang-riak_core%{?_isa} = %(rpm -q --queryformat %{VERSION} erlang-riak_core)
+Requires: erlang-riak_err%{?_isa} = %(rpm -q --queryformat %{VERSION} erlang-riak_err)
+Requires: erlang-riak_kv%{?_isa} = %(rpm -q --queryformat %{VERSION} erlang-riak_kv)
+Requires: erlang-riak_pb%{?_isa} = %(rpm -q --queryformat %{VERSION} erlang-riak_pb)
+Requires: erlang-riak_pipe%{?_isa} = %(rpm -q --queryformat %{VERSION} erlang-riak_pipe)
+Requires: erlang-riak_search%{?_isa} = %(rpm -q --queryformat %{VERSION} erlang-riak_search)
+Requires: erlang-riak_sysmon%{?_isa} = %(rpm -q --queryformat %{VERSION} erlang-riak_sysmon)
+Requires: erlang-sext%{?_isa} >= 1.1
#Initscripts
%if 0%{?fedora}
@@ -76,9 +87,13 @@ decide exactly how fault-tolerant they want and need their applications to be.
%prep
-%setup -q -n %{name}-%{name}-%{version}
-%patch1 -p1 -b .nodeps
-%patch2 -p1 -b .basho-patches-rename
+%setup -q -n %{upstream}-%{realname}-0f9ffd7
+%patch1 -p1 -b .basho-patches-rename
+%patch2 -p1 -b .r16b
+%patch3 -p1 -b .relax_deps
+%patch4 -p1 -b .disable_lager_syslog
+%patch5 -p1 -b .disable_riaknostic
+%patch6 -p1 -b .remove_search_paths
gzip -d doc/man/man1/*.1.gz
sed -i -e "s,\\\n,,g" doc/man/man1/riak-admin.1
@@ -268,6 +283,12 @@ fi
%changelog
+* Sat Apr 06 2013 Peter Lemenkov <lemenkov at gmail.com> - 1.3.1-1
+- Ver. 1.3.1
+
+* Sun Mar 24 2013 Peter Lemenkov <lemenkov at gmail.com> - 1.3.1-0.1.rc1
+- Ver. 1.3.1rc1
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index 0a25bc9..6e8f19b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cfc75a7e067c65b1ec717e8054b572d0 riak-1.2.1.tar.gz
+5476cc155d5c2707854a30d953bab447 basho-riak-riak-1.3.1-0-g66706a0.tar.gz
More information about the scm-commits
mailing list