[erlang-bitcask] Ver. 1.6.0
Peter Lemenkov
peter at fedoraproject.org
Sun Mar 10 11:02:24 UTC 2013
commit 08ff6ef2480703cd3396a753b52c5904a1da527c
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun Mar 10 15:02:10 2013 +0400
Ver. 1.6.0
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
.gitignore | 1 +
erlang-bitcask-0001-Properly-use-lager.patch | 46 ++++++++++++++++++++++++++
erlang-bitcask.spec | 30 +++++++++-------
sources | 2 +-
4 files changed, 65 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5647913..6a24b08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/basho-bitcask-1.5.1-0-g4c6d6df.tar.gz
/basho-bitcask-1.5.2-0-g298fac0.tar.gz
+/basho-bitcask-1.6.0-0-g61f72bf.tar.gz
diff --git a/erlang-bitcask-0001-Properly-use-lager.patch b/erlang-bitcask-0001-Properly-use-lager.patch
new file mode 100644
index 0000000..8cfb763
--- /dev/null
+++ b/erlang-bitcask-0001-Properly-use-lager.patch
@@ -0,0 +1,46 @@
+From c6d93418f1ecae092b8c55136ee7b56351165767 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Sun, 10 Mar 2013 14:36:24 +0400
+Subject: [PATCH 1/1] Properly use lager
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ src/bitcask_file.erl | 11 ++---------
+ 1 file changed, 2 insertions(+), 9 deletions(-)
+
+diff --git a/src/bitcask_file.erl b/src/bitcask_file.erl
+index e2e5e59..fa2c961 100644
+--- a/src/bitcask_file.erl
++++ b/src/bitcask_file.erl
+@@ -22,6 +22,7 @@
+ -module(bitcask_file).
+ -compile(export_all).
+ -behaviour(gen_server).
++-compile([{parse_transform, lager_transform}]).
+
+ %% API
+
+@@ -112,7 +113,7 @@ handle_call({file_open, Owner, Filename, Opts}, _From, State) ->
+ {_, true} ->
+ [read, write, exclusive, raw, binary, read_ahead]
+ end,
+- [warn("Bitcask file option '~p' not supported~n", [Opt])
++ [lager:warning("Bitcask file option '~p' not supported~n", [Opt])
+ || Opt <- [o_sync],
+ proplists:get_bool(Opt, Opts)],
+ case file:open(Filename, Mode) of
+@@ -183,11 +184,3 @@ check_owner({Pid, _Mref}, #state{owner=Owner}) ->
+ throw(owner_invariant_failed),
+ ok
+ end.
+-
+-warn(Fmt, Args) ->
+- case code:which(lager) of
+- non_existing ->
+- io:format(Fmt, Args);
+- _ ->
+- lager:warning(Fmt, Args)
+- end.
+--
+1.8.1.4
+
diff --git a/erlang-bitcask.spec b/erlang-bitcask.spec
index dc74524..6850e10 100644
--- a/erlang-bitcask.spec
+++ b/erlang-bitcask.spec
@@ -1,24 +1,27 @@
%global realname bitcask
%global upstream basho
-%global git_tag 298fac0
+%global git_tag 61f72bf
%global patchnumber 0
%{?filter_setup:
%filter_provides_in %{_libdir}/erlang/lib/.*\.so$
%filter_setup
}
+%{expand: %(NIF_VER=`rpm -q erlang-erts --provides | grep --color=no erl_nif_version` ; if [ "$NIF_VER" != "" ]; then echo %%global __erlang_nif_version $NIF_VER ; fi)}
+%{expand: %(DRV_VER=`rpm -q erlang-erts --provides | grep --color=no erl_drv_version` ; if [ "$DRV_VER" != "" ]; then echo %%global __erlang_drv_version $DRV_VER ; fi)}
Name: erlang-%{realname}
-Version: 1.5.2
-Release: 2%{?dist}
+Version: 1.6.0
+Release: 1%{?dist}
Summary: Eric Brewer-inspired key/value store
Group: Development/Languages
License: ASL 2.0
URL: https://github.com/basho/bitcask
-# wget --content-disposition https://github.com/basho/bitcask/tarball/1.5.2
+# wget --content-disposition https://github.com/basho/bitcask/tarball/1.6.0
Source0: %{upstream}-%{realname}-%{version}-%{patchnumber}-g%{git_tag}.tar.gz
+Patch1: erlang-bitcask-0001-Properly-use-lager.patch
Source1: bitcask.licensing
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildRequires: erlang-lager
BuildRequires: erlang-meck
BuildRequires: erlang-rebar
# Error:erlang(erlang:load_nif/2) in R12B and below
@@ -27,8 +30,10 @@ BuildRequires: erlang-rebar
# Error:erlang(os:timestamp/0) in R12B and below
Requires: erlang-erts%{?_isa} >= R14B
Requires: erlang-kernel%{?_isa}
+Requires: erlang-lager%{?_isa}
# Error:erlang(queue:member/2) in R12B and below
Requires: erlang-stdlib%{?_isa} >= R13B
+%{?__erlang_nif_version:Requires: %{__erlang_nif_version}}
%description
@@ -36,8 +41,8 @@ Eric Brewer-inspired key/value store.
%prep
-%setup -q -n %{upstream}-%{realname}-a32819e
-sed -i -e "s,\s*{meck.*$,,g" rebar.config
+%setup -q -n %{upstream}-%{realname}-0bf3f0d
+%patch1 -p1 -b .lager
%build
@@ -45,7 +50,6 @@ CFLAGS="%{optflags}" rebar compile -v
%install
-rm -rf %{buildroot}
mkdir -p %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/{ebin,include,priv}
install -p -m 0644 ebin/%{realname}.app %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/
install -p -m 0644 ebin/*.beam %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/ebin
@@ -53,12 +57,8 @@ install -p -m 0644 include/*.hrl %{buildroot}%{_libdir}/erlang/lib/%{realname}-%
install -p -m 0755 priv/%{realname}.so %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/priv/
-%clean
-rm -rf %{buildroot}
-
-
%check
-rebar eunit -v
+rebar eunit skip_deps=true -v
%files
@@ -74,6 +74,10 @@ rebar eunit -v
%changelog
+* Sun Mar 10 2013 Peter Lemenkov <lemenkov at gmail.com> - 1.6.0-1
+- Ver. 1.6.0
+- Fix FTBFS in Rawhide (F19)
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index f0aa081..c9f2605 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b207cf2afeb4a61a7b3bd51315a8a317 basho-bitcask-1.5.2-0-g298fac0.tar.gz
+2bec8ba6d215f9a27126ffd8c98cdbb2 basho-bitcask-1.6.0-0-g61f72bf.tar.gz
More information about the scm-commits
mailing list