[riak] Ver. 1.3.2
Peter Lemenkov
peter at fedoraproject.org
Tue Aug 6 18:19:53 UTC 2013
commit 167e2d7cfd3a9027040bd34c88d62a29a034da7d
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue Aug 6 21:16:14 2013 +0400
Ver. 1.3.2
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
.gitignore | 1 +
riak-0001-Rename-basho-patches-directory.patch | 12 +-
...Don-t-require-specific-Erlang-OTP-version.patch | 8 +-
riak-0003-Relax-version-deps.patch | 18 ++--
...-Temporarily-disable-lager_syslog-backend.patch | 18 ++--
... riak-0005-Remove-additional-search-paths.patch | 10 +-
riak-0005-TEMPORARY-disable-riaknostic.patch | 70 -----------
...0006-Don-t-use-versioned-path-for-escript.patch | 74 ++++++++++++
...stall-nodetool-into-bindir-and-add-prefix.patch | 56 +++++++++
riak.service | 1 +
riak.spec | 124 +++++++++++---------
sources | 2 +-
12 files changed, 236 insertions(+), 158 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f3df34a..511e3ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/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
+/basho-riak-riak-1.3.2-0-gc315dc9.tar.gz
diff --git a/riak-0001-Rename-basho-patches-directory.patch b/riak-0001-Rename-basho-patches-directory.patch
index d417e60..bb7abd8 100644
--- a/riak-0001-Rename-basho-patches-directory.patch
+++ b/riak-0001-Rename-basho-patches-directory.patch
@@ -1,7 +1,7 @@
-From 9a5d515a3385583f9aed305427e110d3d3aeaa40 Mon Sep 17 00:00:00 2001
+From c048f5b74f3ec192a6133976bb37e1f6e0a6417d 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
+Subject: [PATCH 1/7] Rename basho-patches directory
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -9,7 +9,7 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rel/reltool.config b/rel/reltool.config
-index 2fdfcb0..1399e33 100644
+index d212378..8830601 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -74,6 +74,6 @@
@@ -18,9 +18,9 @@ index 2fdfcb0..1399e33 100644
{template, "files/key.pem", "etc/key.pem"},
- {mkdir, "lib/basho-patches"},
- {copy, "../ebin/etop_txt.beam", "lib/basho-patches"}
-+ {mkdir, "lib/riak-1.2.1/ebin"},
-+ {copy, "../ebin/etop_txt.beam", "lib/riak-1.2.1/ebin"}
++ {mkdir, "lib/riak-1.3.2/ebin"},
++ {copy, "../ebin/etop_txt.beam", "lib/riak-1.3.2/ebin"}
]}.
--
-1.8.2
+1.8.3.1
diff --git a/riak-0002-Don-t-require-specific-Erlang-OTP-version.patch b/riak-0002-Don-t-require-specific-Erlang-OTP-version.patch
index 1014144..a5dd15c 100644
--- a/riak-0002-Don-t-require-specific-Erlang-OTP-version.patch
+++ b/riak-0002-Don-t-require-specific-Erlang-OTP-version.patch
@@ -1,7 +1,7 @@
-From 9230035d3126d5e3ec384b908ce405e5a33a9883 Mon Sep 17 00:00:00 2001
+From 6cbaf21ab0e542e4d0b6b4348b8f376b949d6d19 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
+Subject: [PATCH 2/7] Don't require specific Erlang/OTP version
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -9,7 +9,7 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
1 file changed, 2 deletions(-)
diff --git a/rebar.config b/rebar.config
-index 0e74593..1fac886 100644
+index 86a0196..0986230 100644
--- a/rebar.config
+++ b/rebar.config
@@ -1,8 +1,6 @@
@@ -22,5 +22,5 @@ index 0e74593..1fac886 100644
{lib_dirs, ["deps", "deps/riak_search/apps/"]}.
--
-1.8.2
+1.8.3.1
diff --git a/riak-0003-Relax-version-deps.patch b/riak-0003-Relax-version-deps.patch
index bb65786..a02d4ff 100644
--- a/riak-0003-Relax-version-deps.patch
+++ b/riak-0003-Relax-version-deps.patch
@@ -1,7 +1,7 @@
-From 9cc089faf48c313bd6ae1c1303005fbbd628f34e Mon Sep 17 00:00:00 2001
+From 827f1f9698ec9bc1fdb1691c0982e5084df7e25b 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
+Subject: [PATCH 3/7] Relax version deps
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -9,20 +9,20 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rebar.config b/rebar.config
-index 1fac886..68b3d88 100644
+index 0986230..dbea567 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_kv, "1.3.2", {git, "git://github.com/basho/riak_kv", {tag, "1.3.2"}}},
- {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"}}},
++ {riak_search, "1.3.2", {git, "git://github.com/basho/riak_search",
+ {tag, "1.3.2"}}},
+- {riak_control, "1.3.0", {git, "git://github.com/basho/riak_control", {tag, "1.3.2"}}},
++ {riak_control, "1.3.2", {git, "git://github.com/basho/riak_control", {tag, "1.3.2"}}},
{riaknostic, "1.1.0", {git, "git://github.com/basho/riaknostic", {tag, "v1.1.0"}}}
]}.
--
-1.8.2
+1.8.3.1
diff --git a/riak-0004-Temporarily-disable-lager_syslog-backend.patch b/riak-0004-Temporarily-disable-lager_syslog-backend.patch
index c959872..fb7f904 100644
--- a/riak-0004-Temporarily-disable-lager_syslog-backend.patch
+++ b/riak-0004-Temporarily-disable-lager_syslog-backend.patch
@@ -1,7 +1,7 @@
-From 79b3d2a2aa0148d5f574f7b34d6d66e4f873f78d Mon Sep 17 00:00:00 2001
+From d38a1441fb47c3f5156435de5a85e80d2fecf9ba 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
+Subject: [PATCH 4/7] Temporarily disable lager_syslog backend
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -11,7 +11,7 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
3 files changed, 7 deletions(-)
diff --git a/rebar.config b/rebar.config
-index 68b3d88..84e8e18 100644
+index dbea567..703d197 100644
--- a/rebar.config
+++ b/rebar.config
@@ -8,7 +8,6 @@
@@ -20,13 +20,13 @@ index 68b3d88..84e8e18 100644
{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",
+ {riak_kv, "1.3.2", {git, "git://github.com/basho/riak_kv", {tag, "1.3.2"}}},
+ {riak_search, "1.3.2", {git, "git://github.com/basho/riak_search",
diff --git a/rel/files/app.config b/rel/files/app.config
-index c3d61b4..d86fe47 100644
+index 37af731..4a7671d 100644
--- a/rel/files/app.config
+++ b/rel/files/app.config
-@@ -243,10 +243,6 @@
+@@ -247,10 +247,6 @@
%% and the rotation time to "", or instead specify a 2-tuple that only
%% consists of {Logfile, Level}.
%%
@@ -38,7 +38,7 @@ index c3d61b4..d86fe47 100644
%% Whether to write a crash log, and where.
diff --git a/rel/reltool.config b/rel/reltool.config
-index 1399e33..6147a25 100644
+index 8830601..0bfcdf5 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -49,8 +49,6 @@
@@ -51,5 +51,5 @@ index 1399e33..6147a25 100644
{app, riak_control, [{incl_cond, include}]},
{app, riak_api, [{incl_cond, include}]},
--
-1.8.2
+1.8.3.1
diff --git a/riak-0006-Remove-additional-search-paths.patch b/riak-0005-Remove-additional-search-paths.patch
similarity index 75%
rename from riak-0006-Remove-additional-search-paths.patch
rename to riak-0005-Remove-additional-search-paths.patch
index ebb3dc3..adb981f 100644
--- a/riak-0006-Remove-additional-search-paths.patch
+++ b/riak-0005-Remove-additional-search-paths.patch
@@ -1,7 +1,7 @@
-From 6b48e8b962010d3c2653c486a39b221b728352d1 Mon Sep 17 00:00:00 2001
+From 431927babc9b457d5c2b155f4bc6cae4c9ee9e5b 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
+Subject: [PATCH 5/7] Remove additional search paths
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -9,7 +9,7 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rel/reltool.config b/rel/reltool.config
-index 6147a25..d4ffe09 100644
+index 0bfcdf5..e9272ea 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -1,7 +1,7 @@
@@ -18,9 +18,9 @@ index 6147a25..d4ffe09 100644
{sys, [
- {lib_dirs, ["../deps", "../deps/riak_search/apps"]},
+ {lib_dirs, []},
- {rel, "riak", "1.3.1",
+ {rel, "riak", "1.3.2",
[
kernel,
--
-1.8.2
+1.8.3.1
diff --git a/riak-0006-Don-t-use-versioned-path-for-escript.patch b/riak-0006-Don-t-use-versioned-path-for-escript.patch
new file mode 100644
index 0000000..3362970
--- /dev/null
+++ b/riak-0006-Don-t-use-versioned-path-for-escript.patch
@@ -0,0 +1,74 @@
+From 016cb820577a012c63209133b9790fa642378071 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Thu, 1 Aug 2013 17:38:57 +0400
+Subject: [PATCH 6/7] Don't use versioned path for escript
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ rel/files/riak | 6 +++---
+ rel/files/riak-admin | 4 ++--
+ rel/files/search-cmd | 2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/rel/files/riak b/rel/files/riak
+index 440cff3..8cef9d8 100755
+--- a/rel/files/riak
++++ b/rel/files/riak
+@@ -90,8 +90,8 @@ APP_VSN=${START_ERL#* }
+ ERTS_PATH=$RUNNER_BASE_DIR/erts-$ERTS_VSN/bin
+
+ # Setup command to control the node
+-NODETOOL="$ERTS_PATH/escript $ERTS_PATH/nodetool $NAME_ARG $COOKIE_ARG"
+-NODETOOL_LITE="$ERTS_PATH/escript $ERTS_PATH/nodetool"
++NODETOOL="/usr/bin/escript $ERTS_PATH/nodetool $NAME_ARG $COOKIE_ARG"
++NODETOOL_LITE="/usr/bin/escript $ERTS_PATH/nodetool"
+
+ # Common functions
+
+@@ -299,7 +299,7 @@ case "$1" in
+ ;;
+ escript)
+ shift
+- $ERTS_PATH/escript "$@"
++ /usr/bin/escript "$@"
+ ;;
+ version)
+ echo $RIAK_VERSION
+diff --git a/rel/files/riak-admin b/rel/files/riak-admin
+index 8a5d522..582de7e 100755
+--- a/rel/files/riak-admin
++++ b/rel/files/riak-admin
+@@ -77,7 +77,7 @@ APP_VSN=${START_ERL#* }
+ ERTS_PATH=$RUNNER_BASE_DIR/erts-$ERTS_VSN/bin
+
+ # Setup command to control the node
+-NODETOOL="$ERTS_PATH/escript $ERTS_PATH/nodetool $NAME_ARG $COOKIE_ARG"
++NODETOOL="/usr/bin/escript $ERTS_PATH/nodetool $NAME_ARG $COOKIE_ARG"
+
+ ensure_node_running()
+ {
+@@ -554,7 +554,7 @@ case "$1" in
+ fi
+
+ # Setup command to run riaknostic
+- RIAKNOSTIC="$ERTS_PATH/escript $RIAKNOSTIC_LOC --user $RIAKNOSTIC_USER \
++ RIAKNOSTIC="/usr/bin/escript $RIAKNOSTIC_LOC --user $RIAKNOSTIC_USER \
+ --etc $RUNNER_ETC_DIR --base $RUNNER_BASE_DIR"
+
+ # URL for Riaknostic download instructions
+diff --git a/rel/files/search-cmd b/rel/files/search-cmd
+index a82af01..822fadd 100755
+--- a/rel/files/search-cmd
++++ b/rel/files/search-cmd
+@@ -72,7 +72,7 @@ APP_VSN=${START_ERL#* }
+ ERTS_PATH=$RUNNER_BASE_DIR/erts-$ERTS_VSN/bin
+
+ # Setup command to control the node
+-NODETOOL="$ERTS_PATH/escript $ERTS_PATH/nodetool $NAME_ARG $COOKIE_ARG"
++NODETOOL=/usr/bin/escript $ERTS_PATH/nodetool $NAME_ARG $COOKIE_ARG"
+
+ # Make sure the local node IS running
+ RES=`$NODETOOL ping`
+--
+1.8.3.1
+
diff --git a/riak-0007-Install-nodetool-into-bindir-and-add-prefix.patch b/riak-0007-Install-nodetool-into-bindir-and-add-prefix.patch
new file mode 100644
index 0000000..ffb8fa6
--- /dev/null
+++ b/riak-0007-Install-nodetool-into-bindir-and-add-prefix.patch
@@ -0,0 +1,56 @@
+From 68f4730e3b760dca9de8a8864ade8cf6d990417d Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Thu, 1 Aug 2013 17:45:43 +0400
+Subject: [PATCH 7/7] Install nodetool into bindir and add prefix
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ rel/files/riak | 4 ++--
+ rel/files/riak-admin | 2 +-
+ rel/files/search-cmd | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/rel/files/riak b/rel/files/riak
+index 8cef9d8..f8caf97 100755
+--- a/rel/files/riak
++++ b/rel/files/riak
+@@ -90,8 +90,8 @@ APP_VSN=${START_ERL#* }
+ ERTS_PATH=$RUNNER_BASE_DIR/erts-$ERTS_VSN/bin
+
+ # Setup command to control the node
+-NODETOOL="/usr/bin/escript $ERTS_PATH/nodetool $NAME_ARG $COOKIE_ARG"
+-NODETOOL_LITE="/usr/bin/escript $ERTS_PATH/nodetool"
++NODETOOL="/usr/bin/escript /usr/bin/riak-nodetool $NAME_ARG $COOKIE_ARG"
++NODETOOL_LITE="/usr/bin/escript /usr/bin/riak-nodetool"
+
+ # Common functions
+
+diff --git a/rel/files/riak-admin b/rel/files/riak-admin
+index 582de7e..2d609e0 100755
+--- a/rel/files/riak-admin
++++ b/rel/files/riak-admin
+@@ -77,7 +77,7 @@ APP_VSN=${START_ERL#* }
+ ERTS_PATH=$RUNNER_BASE_DIR/erts-$ERTS_VSN/bin
+
+ # Setup command to control the node
+-NODETOOL="/usr/bin/escript $ERTS_PATH/nodetool $NAME_ARG $COOKIE_ARG"
++NODETOOL="/usr/bin/escript /usr/bin/riak-nodetool $NAME_ARG $COOKIE_ARG"
+
+ ensure_node_running()
+ {
+diff --git a/rel/files/search-cmd b/rel/files/search-cmd
+index 822fadd..3e0072c 100755
+--- a/rel/files/search-cmd
++++ b/rel/files/search-cmd
+@@ -72,7 +72,7 @@ APP_VSN=${START_ERL#* }
+ ERTS_PATH=$RUNNER_BASE_DIR/erts-$ERTS_VSN/bin
+
+ # Setup command to control the node
+-NODETOOL=/usr/bin/escript $ERTS_PATH/nodetool $NAME_ARG $COOKIE_ARG"
++NODETOOL=/usr/bin/escript /usr/bin/riak-nodetool $NAME_ARG $COOKIE_ARG"
+
+ # Make sure the local node IS running
+ RES=`$NODETOOL ping`
+--
+1.8.3.1
+
diff --git a/riak.service b/riak.service
index 691718b..59a1ac6 100644
--- a/riak.service
+++ b/riak.service
@@ -5,6 +5,7 @@ After=network.target
[Service]
User=riak
Group=riak
+LimitNOFILE=16384
Type=forking
StandardOutput=journal
StandardError=journal
diff --git a/riak.spec b/riak.spec
index 8f98359..5c7c4fd 100644
--- a/riak.spec
+++ b/riak.spec
@@ -1,21 +1,28 @@
%global realname riak
%global upstream basho
+#
+# This package contains only arch-independent data but install it into
+# arch-dependent directory thus making this package arch-dependent. In order to
+# suppress empty *-debuginfo generation we have to explicitly order
+# debuginfo-generator to skip trying to build *-debuiginfo for that package.
+#
%global debug_package %{nil}
-%global git_tag 66706a0
+%global git_tag c315dc9
%global patchnumber 0
-%global ertsver %(%{_libdir}/erlang/bin/erl -noshell -eval 'io:format("~s", [erlang:system_info(version)]), halt().')
+%define lock_version() %{1}%{?_isa} = %(rpm -q --queryformat "%{VERSION}" %{1})
Name: riak
-Version: 1.3.1
-Release: 3%{?dist}
+Version: 1.3.2
+Release: 1%{?dist}
Summary: Dynamo-inspired key/value store
Group: Applications/Databases
License: ASL 2.0
URL: http://wiki.basho.com/Riak.html
-# wget --content-disposition https://github.com/basho/riak/tarball/riak-1.3.1
+VCS: https://github.com/basho/riak.git
+# wget --content-disposition https://github.com/basho/riak/tarball/riak-1.3.2
Source0: %{upstream}-%{realname}-riak-%{version}-%{patchnumber}-g%{git_tag}.tar.gz
Source1: %{name}.tmpfiles.conf
Source2: %{name}.init
@@ -24,8 +31,9 @@ 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
+Patch5: %{name}-0005-Remove-additional-search-paths.patch
+Patch6: %{name}-0006-Don-t-use-versioned-path-for-escript.patch
+Patch7: %{name}-0007-Install-nodetool-into-bindir-and-add-prefix.patch
BuildRequires: erlang-rebar
BuildRequires: erlang-cluster_info
BuildRequires: erlang-ebloom
@@ -33,41 +41,49 @@ BuildRequires: erlang-eper
BuildRequires: erlang-riak_control
BuildRequires: erlang-riak_kv
BuildRequires: erlang-riak_search
+BuildRequires: erlang-riaknostic
+
+#
+# Ordinary runtime dependencies
+#
-Requires: erlang-basho_stats%{?_isa} = %(rpm -q --queryformat %{VERSION} erlang-basho_stats)
Requires: erlang-bear%{?_isa}
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} = %(rpm -q --queryformat %{VERSION} erlang-eleveldb)
Requires: erlang-eper%{?_isa}
Requires: erlang-erlydtl%{?_isa}
Requires: erlang-folsom%{?_isa}
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} = %(rpm -q --queryformat %{VERSION} erlang-merge_index)
Requires: erlang-mochiweb%{?_isa}
Requires: erlang-poolboy%{?_isa}
Requires: erlang-protobuffs%{?_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}
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-%else
+#
+# These packages are tightl ycoupled to the core and
+# must be a strict dependencies
+#
+
+Requires: %lock_version erlang-basho_stats
+Requires: %lock_version erlang-cluster_info
+Requires: %lock_version erlang-eleveldb
+Requires: %lock_version erlang-lager
+# FIXME - I'll add luwak backend later
+#Requires: %lock_version erlang-luwak
+Requires: %lock_version erlang-merge_index
+Requires: %lock_version erlang-riak_api
+Requires: %lock_version erlang-riak_control
+Requires: %lock_version erlang-riak_core
+Requires: %lock_version erlang-riak_err
+Requires: %lock_version erlang-riak_kv
+Requires: %lock_version erlang-riak_pb
+Requires: %lock_version erlang-riak_pipe
+Requires: %lock_version erlang-riak_search
+Requires: %lock_version erlang-riak_sysmon
+Requires: %lock_version erlang-riaknostic
+
+%if 0%{?el5}%{?el6}
+# Require initscripts on old systemd
Requires(post): chkconfig
Requires(preun): chkconfig initscripts
%endif
@@ -87,13 +103,14 @@ decide exactly how fault-tolerant they want and need their applications to be.
%prep
-%setup -q -n %{upstream}-%{realname}-0f9ffd7
+%setup -q -n %{upstream}-%{realname}-51ccac6
%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
+%patch5 -p1 -b .remove_search_paths
+%patch6 -p1 -b .fix_escript
+%patch7 -p1 -b .fix_nodetool
gzip -d doc/man/man1/*.1.gz
sed -i -e "s,\\\n,,g" doc/man/man1/riak-admin.1
@@ -168,11 +185,11 @@ install -D -p -m 0644 rel/%{name}/etc/app.config %{buildroot}%{_sysconfdir}/%{na
install -D -p -m 0644 rel/%{name}/etc/vm.args %{buildroot}%{_sysconfdir}/%{name}/vm.args
# Install init-script or systemd-service
-%if 0%{?fedora}
+%if 0%{?el5}%{?el6}
+install -D -p -m 0755 %{SOURCE2} %{buildroot}%{_initrddir}/%{name}
+%else
install -D -p -m 644 %{SOURCE1} %{buildroot}/usr/lib/tmpfiles.d/%{name}.conf
install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}.service
-%else
-install -D -p -m 0755 %{SOURCE2} %{buildroot}%{_initrddir}/%{name}
%endif
# Install runtime scripts
@@ -215,12 +232,11 @@ install -m 644 rel/%{name}/releases/%{version}/start_clean.rel %{buildroot}/%{_l
install -m 644 rel/%{name}/releases/%{version}/start_clean.script %{buildroot}/%{_libdir}/%{name}/releases/%{version}/
# Install nodetool
-install -D -p -m 755 rel/%{name}/erts-%{ertsver}/bin/nodetool %{buildroot}/%{_libdir}/erlang/erts-%{ertsver}/bin/nodetool
+install -D -p -m 755 rel/%{name}/erts-*/bin/nodetool %{buildroot}/%{_bindir}/%{name}-nodetool
# Make compat symlinks
cd %{buildroot}/%{_libdir}/%{name}
ln -s %{_libdir}/erlang/lib lib
-ln -s %{_libdir}/erlang/erts-%{ertsver} erts-%{ertsver}
%pre
@@ -231,44 +247,38 @@ useradd -r -g %{name} -d %{_localstatedir}/run/%{name} -s /sbin/nologin \
%post
-%if 0%{?fedora}
-if [ $1 -eq 1 ] ; then
- # Initial installation
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
-%else
+%if 0%{?el5}%{?el6}
/sbin/chkconfig --add %{name}
+%else
+%systemd_post %{name}.service
%endif
%preun
-%if 0%{?fedora}
-if [ $1 -eq 0 ] ; then
- # Package removal, not upgrade
- /bin/systemctl --no-reload disable %{name}.service > /dev/null 2>&1 || :
- /bin/systemctl stop %{name}.service > /dev/null 2>&1 || :
-fi
-%else
+%if 0%{?el5}%{?el6}
if [ $1 = 0 ]; then
/sbin/service %{name} stop > /dev/null 2>&1
/sbin/chkconfig --del %{name}
fi
+%else
+%systemd_preun %{name}.service
%endif
%files
%doc doc/[abdr]* releasenotes/ LICENSE NOTICE README.org RELEASE-NOTES.md THANKS
-%if 0%{?fedora}
+%if 0%{?el5}%{?el6}
+%{_initrddir}/%{name}
+%else
/usr/lib/tmpfiles.d/%{name}.conf
%{_unitdir}/%{name}.service
-%else
-%{_initrddir}/%{name}
%endif
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/app.config
%config(noreplace) %{_sysconfdir}/%{name}/vm.args
%{_bindir}/%{name}
%{_bindir}/%{name}-admin
+%{_bindir}/%{name}-nodetool
%{_bindir}/search-cmd
%dir %{_libdir}/erlang/lib/%{name}-%{version}
%dir %{_libdir}/erlang/lib/%{name}-%{version}/ebin
@@ -278,7 +288,6 @@ fi
%{_mandir}/man1/%{name}-admin.1.gz
%{_mandir}/man1/search-cmd.1.gz
%{_libdir}/%{name}/
-%{_libdir}/erlang/erts-%{ertsver}/bin/nodetool
%dir %attr(0755, %{name}, %{name}) %{_localstatedir}/lib/%{name}/
%dir %attr(0755, %{name}, %{name}) %{_localstatedir}/lib/%{name}/bitcask/
%dir %attr(0755, %{name}, %{name}) %{_localstatedir}/lib/%{name}/dets/
@@ -292,6 +301,13 @@ fi
%changelog
+* Tue Aug 06 2013 Peter Lemenkov <lemenkov at gmail.com> - 1.3.2-1
+- Ver. 1.3.2
+- Raised a number of opened files/sockets to 16384
+- Install nodetool into _bindir/
+- Don't use versioned path to escript to simplify updates in the future
+- Use systemd macros
+
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 6e8f19b..21c9556 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5476cc155d5c2707854a30d953bab447 basho-riak-riak-1.3.1-0-g66706a0.tar.gz
+1a9cdbc8d366353816c02d268bb0851a basho-riak-riak-1.3.2-0-gc315dc9.tar.gz
More information about the scm-commits
mailing list