[riak] Ver. 1.2.1
Peter Lemenkov
peter at fedoraproject.org
Sun Nov 18 15:58:22 UTC 2012
commit 95e53e403ef9d9fb9d5db16787d3f3ee8d31a2ef
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun Nov 18 19:58:15 2012 +0400
Ver. 1.2.1
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
.gitignore | 1 +
...-OTP-version-R15-to-allowed-version-regex.patch | 24 -----
...o-install-dependencies-Fedora-EPEL-specif.patch | 45 +++++++++
...o-install-dependencies-Fedora-EPEL-specif.patch | 42 ---------
... riak-0002-Rename-basho-patches-directory.patch | 15 ++--
riak.spec | 97 ++++++++++++--------
sources | 2 +-
7 files changed, 111 insertions(+), 115 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f724bf2..148de8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/basho-riak-riak-1.1.4-0-g95c5cb6.tar.gz
+/riak-1.2.1.tar.gz
diff --git a/riak-0001-Don-t-try-to-install-dependencies-Fedora-EPEL-specif.patch b/riak-0001-Don-t-try-to-install-dependencies-Fedora-EPEL-specif.patch
new file mode 100644
index 0000000..cd5dd3e
--- /dev/null
+++ b/riak-0001-Don-t-try-to-install-dependencies-Fedora-EPEL-specif.patch
@@ -0,0 +1,45 @@
+From dd560fd24d3c1218dc5b9edb13eef9fdc0847260 Mon Sep 17 00:00:00 2001
+From: Fedora Build <lemenkov at gmail.com>
+Date: Fri, 10 Aug 2012 18:52:31 +0400
+Subject: [PATCH 1/2] Don't try to install dependencies (Fedora/EPEL-specific)
+
+Signed-off-by: Fedora Build <lemenkov at gmail.com>
+---
+ rebar.config | 10 ----------
+ rel/reltool.config | 1 -
+ 2 files changed, 11 deletions(-)
+
+diff --git a/rebar.config b/rebar.config
+index 499b4e0..f7d1975 100644
+--- a/rebar.config
++++ b/rebar.config
+@@ -4,14 +4,4 @@
+
+ {cover_enabled, true}.
+
+-{lib_dirs, ["deps", "deps/riak_search/apps/"]}.
+-
+ {erl_opts, [debug_info, fail_on_warning]}.
+-
+-{deps, [
+- {cluster_info, "1.2.2", {git, "git://github.com/basho/cluster_info", {tag, "1.2.2"}}},
+- {riak_kv, "1.2.1", {git, "git://github.com/basho/riak_kv", {tag, "1.2.1"}}},
+- {riak_search, "1.2.1", {git, "git://github.com/basho/riak_search",
+- {tag, "1.2.1"}}},
+- {riak_control, "1.2.0", {git, "git://github.com/basho/riak_control", {tag, "1.2.1"}}}
+- ]}.
+diff --git a/rel/reltool.config b/rel/reltool.config
+index e1c3d64..5154fbd 100644
+--- a/rel/reltool.config
++++ b/rel/reltool.config
+@@ -1,7 +1,6 @@
+ %% -*- 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"]},
+ {rel, "riak", "1.2.1",
+ [
+ kernel,
+--
+1.8.0
+
diff --git a/riak-0003-Rename-basho-patches-directory.patch b/riak-0002-Rename-basho-patches-directory.patch
similarity index 68%
rename from riak-0003-Rename-basho-patches-directory.patch
rename to riak-0002-Rename-basho-patches-directory.patch
index 00fe680..148cd47 100644
--- a/riak-0003-Rename-basho-patches-directory.patch
+++ b/riak-0002-Rename-basho-patches-directory.patch
@@ -1,7 +1,7 @@
-From 1c884bf9e89ab974dea4cf4879b9f1d5d19ca8b9 Mon Sep 17 00:00:00 2001
+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 3/3] Rename basho-patches directory
+Subject: [PATCH 2/2] Rename basho-patches directory
Signed-off-by: Fedora Build <lemenkov at gmail.com>
---
@@ -9,19 +9,18 @@ Signed-off-by: Fedora Build <lemenkov at gmail.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rel/reltool.config b/rel/reltool.config
-index 3b581ac..afa2879 100644
+index 5154fbd..ac7928c 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
-@@ -70,7 +70,7 @@
+@@ -73,6 +73,6 @@
{template, "files/vm.args", "etc/vm.args"},
{template, "files/cert.pem", "etc/cert.pem"},
{template, "files/key.pem", "etc/key.pem"},
- {mkdir, "lib/basho-patches"},
- {copy, "../ebin/etop_txt.beam", "lib/basho-patches"}
-+ {mkdir, "lib/riak-1.1.4/ebin"},
-+ {copy, "../ebin/etop_txt.beam", "lib/riak-1.1.4/ebin"}
++ {mkdir, "lib/riak-1.2.1/ebin"},
++ {copy, "../ebin/etop_txt.beam", "lib/riak-1.2.1/ebin"}
]}.
-
--
-1.7.11.2
+1.8.0
diff --git a/riak.spec b/riak.spec
index 3d95645..8cd42c5 100644
--- a/riak.spec
+++ b/riak.spec
@@ -1,25 +1,20 @@
-%global realname riak
-%global upstream basho
%global debug_package %{nil}
-%global git_tag 95c5cb6
-%global patchnumber 0
+%global ertsver 5.9.2
-Name: %{realname}
-Version: 1.1.4
-Release: 2%{?dist}
+Name: riak
+Version: 1.2.1
+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.1.4
-Source0: %{upstream}-%{realname}-%{realname}-%{version}-%{patchnumber}-g%{git_tag}.tar.gz
+Source0: https://github.com/basho/riak/archive/%{name}-%{version}.tar.gz
Source1: %{name}.tmpfiles.conf
Source2: %{name}.init
Source3: %{name}.service
-Patch1: riak-0001-Add-OTP-version-R15-to-allowed-version-regex.patch
-Patch2: riak-0002-Don-t-try-to-install-dependencies-Fedora-EPEL-specif.patch
-Patch3: riak-0003-Rename-basho-patches-directory.patch
+Patch1: %{name}-0001-Don-t-try-to-install-dependencies-Fedora-EPEL-specif.patch
+Patch2: %{name}-0002-Rename-basho-patches-directory.patch
BuildRequires: erlang-rebar
BuildRequires: erlang-cluster_info
BuildRequires: erlang-eper
@@ -27,13 +22,34 @@ BuildRequires: erlang-riak_control
BuildRequires: erlang-riak_kv
BuildRequires: erlang-riak_search
-Requires: erlang-cluster_info
-Requires: erlang-eper
-Requires: erlang-riak_control
-Requires: erlang-riak_kv
-Requires: erlang-riak_search
+Requires: erlang-basho_stats%{?_isa} = 1.0.2
+Requires: erlang-bear%{?_isa}
+Requires: erlang-bitcask%{?_isa} = 1.5.2
+Requires: erlang-cluster_info%{?_isa} = 1.2.2
+Requires: erlang-ebloom%{?_isa}
+Requires: erlang-eleveldb%{?_isa} = 1.2.2
+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
# FIXME - I'll add luwak backend later
-#Requires: erlang-luwak
+#Requires: erlang-luwak%{?_isa}
+Requires: erlang-merge_index%{?_isa} = 1.2.1
+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}
#Initscripts
%if 0%{?fedora}
@@ -60,11 +76,9 @@ decide exactly how fault-tolerant they want and need their applications to be.
%prep
-echo "WM " %{webmachinever}
-%setup -q -n %{upstream}-%{realname}-83ec281
-%patch1 -p1 -b .r15b
-%patch2 -p1 -b .nodeps
-%patch3 -p1 -b .basho-patches-rename
+%setup -q -n %{name}-%{name}-%{version}
+%patch1 -p1 -b .nodeps
+%patch2 -p1 -b .basho-patches-rename
gzip -d doc/man/man1/*.1.gz
sed -i -e "s,\\\n,,g" doc/man/man1/riak-admin.1
@@ -126,8 +140,8 @@ rebar compile generate -v
%install
# Install Erlang VM config files
mkdir -p %{buildroot}%{_sysconfdir}/%{name}
-install -D -p -m 0644 rel/riak/etc/app.config %{buildroot}%{_sysconfdir}/%{name}/app.config
-install -D -p -m 0644 rel/riak/etc/vm.args %{buildroot}%{_sysconfdir}/%{name}/vm.args
+install -D -p -m 0644 rel/%{name}/etc/app.config %{buildroot}%{_sysconfdir}/%{name}/app.config
+install -D -p -m 0644 rel/%{name}/etc/vm.args %{buildroot}%{_sysconfdir}/%{name}/vm.args
# Install init-script or systemd-service
%if 0%{?fedora}
@@ -138,9 +152,9 @@ install -D -p -m 0755 %{SOURCE2} %{buildroot}%{_initrddir}/%{name}
%endif
# Install runtime scripts
-install -p -m 0755 -D rel/riak/bin/%{name} %{buildroot}%{_bindir}/%{name}
-install -p -m 0755 -D rel/riak/bin/%{name}-admin %{buildroot}%{_bindir}/%{name}-admin
-install -p -m 0755 -D rel/riak/bin/search-cmd %{buildroot}%{_bindir}/search-cmd
+install -p -m 0755 -D rel/%{name}/bin/%{name} %{buildroot}%{_bindir}/%{name}
+install -p -m 0755 -D rel/%{name}/bin/%{name}-admin %{buildroot}%{_bindir}/%{name}-admin
+install -p -m 0755 -D rel/%{name}/bin/search-cmd %{buildroot}%{_bindir}/search-cmd
# Install man-pages
install -d %{buildroot}%{_mandir}/man1/
@@ -167,22 +181,22 @@ mkdir -p %{buildroot}/%{_localstatedir}/run/%{name}/
# Install Erlang release binary data
mkdir -p %{buildroot}/%{_libdir}/%{name}/releases/%{version}/
-install -m 644 rel/riak/releases/RELEASES %{buildroot}/%{_libdir}/%{name}/releases/
-install -m 644 rel/riak/releases/start_erl.data %{buildroot}/%{_libdir}/%{name}/releases/
-install -m 644 rel/riak/releases/1.1.4/riak.boot %{buildroot}/%{_libdir}/%{name}/releases/%{version}/
-install -m 644 rel/riak/releases/1.1.4/riak.rel %{buildroot}/%{_libdir}/%{name}/releases/%{version}/
-install -m 644 rel/riak/releases/1.1.4/riak.script %{buildroot}/%{_libdir}/%{name}/releases/%{version}/
-install -m 644 rel/riak/releases/1.1.4/start_clean.boot %{buildroot}/%{_libdir}/%{name}/releases/%{version}/
-install -m 644 rel/riak/releases/1.1.4/start_clean.rel %{buildroot}/%{_libdir}/%{name}/releases/%{version}/
-install -m 644 rel/riak/releases/1.1.4/start_clean.script %{buildroot}/%{_libdir}/%{name}/releases/%{version}/
+install -m 644 rel/%{name}/releases/RELEASES %{buildroot}/%{_libdir}/%{name}/releases/
+install -m 644 rel/%{name}/releases/start_erl.data %{buildroot}/%{_libdir}/%{name}/releases/
+install -m 644 rel/%{name}/releases/%{version}/%{name}.boot %{buildroot}/%{_libdir}/%{name}/releases/%{version}/
+install -m 644 rel/%{name}/releases/%{version}/%{name}.rel %{buildroot}/%{_libdir}/%{name}/releases/%{version}/
+install -m 644 rel/%{name}/releases/%{version}/%{name}.script %{buildroot}/%{_libdir}/%{name}/releases/%{version}/
+install -m 644 rel/%{name}/releases/%{version}/start_clean.boot %{buildroot}/%{_libdir}/%{name}/releases/%{version}/
+install -m 644 rel/%{name}/releases/%{version}/start_clean.rel %{buildroot}/%{_libdir}/%{name}/releases/%{version}/
+install -m 644 rel/%{name}/releases/%{version}/start_clean.script %{buildroot}/%{_libdir}/%{name}/releases/%{version}/
# Install nodetool
-install -D -p -m 755 rel/riak/erts-5.9.1/bin/nodetool %{buildroot}/%{_libdir}/erlang/erts-5.9.1/bin/nodetool
+install -D -p -m 755 rel/%{name}/erts-%{ertsver}/bin/nodetool %{buildroot}/%{_libdir}/erlang/erts-%{ertsver}/bin/nodetool
# Make compat symlinks
cd %{buildroot}/%{_libdir}/%{name}
ln -s %{_libdir}/erlang/lib lib
-ln -s %{_libdir}/erlang/erts-5.9.1 erts-5.9.1
+ln -s %{_libdir}/erlang/erts-%{ertsver} erts-%{ertsver}
%pre
@@ -219,7 +233,7 @@ fi
%files
-%doc doc/[abdr]* releasenotes/ LICENSE NOTICE README.org RELEASE-NOTES.org THANKS
+%doc doc/[abdr]* releasenotes/ LICENSE NOTICE README.org RELEASE-NOTES.md THANKS
%if 0%{?fedora}
/usr/lib/tmpfiles.d/%{name}.conf
%{_unitdir}/%{name}.service
@@ -240,7 +254,7 @@ fi
%{_mandir}/man1/%{name}-admin.1.gz
%{_mandir}/man1/search-cmd.1.gz
%{_libdir}/%{name}/
-%{_libdir}/erlang/erts-5.9.1/bin/nodetool
+%{_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/
@@ -254,6 +268,9 @@ fi
%changelog
+* Sun Nov 18 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.2.1-1
+- Ver. 1.2.1
+
* Tue Aug 14 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.1.4-2
- Fixed lots of packaging issues (thanks to Ankur Sinha for noticing them)
diff --git a/sources b/sources
index 406491d..0a25bc9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5bfc5b77f520adc48eff426bc8f4db95 basho-riak-riak-1.1.4-0-g95c5cb6.tar.gz
+cfc75a7e067c65b1ec717e8054b572d0 riak-1.2.1.tar.gz
More information about the scm-commits
mailing list