diff --git a/.gitignore b/.gitignore index fd46ead..0dc9d6e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /basho-merge_index-1.1.0-0-ge19bf98.tar.gz /basho-merge_index-1.2.1-0-gffc168d.tar.gz /basho-merge_index-1.3.0-0-g6005202.tar.gz +/merge_index-2.1.tar.gz diff --git a/erlang-merge_index-0001-Relax-dependencies.patch b/erlang-merge_index-0001-Relax-dependencies.patch new file mode 100644 index 0000000..390b5d9 --- /dev/null +++ b/erlang-merge_index-0001-Relax-dependencies.patch @@ -0,0 +1,17 @@ +From: Peter Lemenkov +Date: Sat, 5 Mar 2016 20:15:31 +0300 +Subject: [PATCH] Relax dependencies + +Signed-off-by: Peter Lemenkov + +diff --git a/rebar.config b/rebar.config +index fc5d23e..761666a 100644 +--- a/rebar.config ++++ b/rebar.config +@@ -3,5 +3,5 @@ + {eunit_opts, [verbose]}. + + {deps, [ +- {lager, "(2.0|2.1|2.2).*", {git, "git://github.com/basho/lager.git", {tag, "2.2.0"}}} ++ {lager, ".*"} + ]}. diff --git a/erlang-merge_index-0002-use-proper-version-in-app-file.patch b/erlang-merge_index-0002-use-proper-version-in-app-file.patch new file mode 100644 index 0000000..d1a8474 --- /dev/null +++ b/erlang-merge_index-0002-use-proper-version-in-app-file.patch @@ -0,0 +1,18 @@ +From: Peter Lemenkov +Date: Sat, 5 Mar 2016 20:16:13 +0300 +Subject: [PATCH] use proper version in app-file + +Signed-off-by: Peter Lemenkov + +diff --git a/src/merge_index.app.src b/src/merge_index.app.src +index 0a8696b..3d39a28 100644 +--- a/src/merge_index.app.src ++++ b/src/merge_index.app.src +@@ -1,6 +1,6 @@ + {application, merge_index, + [{description, "Merge-Index Data Store"}, +- {vsn, git}, ++ {vsn, "2.1"}, + {applications, [kernel, + stdlib, + sasl]}, diff --git a/erlang-merge_index.spec b/erlang-merge_index.spec index 4e827c3..4a074bd 100644 --- a/erlang-merge_index.spec +++ b/erlang-merge_index.spec @@ -1,52 +1,45 @@ %global realname merge_index %global upstream basho +# Technically, we're noarch; but erlang whose directories we install into is not. %global debug_package %{nil} -%global git_tag 6005202 -%global patchnumber 0 Name: erlang-%{realname} -Version: 1.3.0 -Release: 6%{?dist} +Version: 2.1 +Release: 1%{?dist} Summary: An Erlang library for storing ordered sets on disk Group: Development/Languages License: ASL 2.0 -URL: https://github.com/basho/merge_index -# wget --content-disposition https://github.com/basho/merge_index/tarball/1.3.0 -Source0: %{upstream}-%{realname}-%{version}-%{patchnumber}-g%{git_tag}.tar.gz +URL: https://github.com/%{upstream}/%{realname} +%if 0%{?el7}%{?fedora} +VCS: scm:git:https://github.com/%{upstream}/%{realname}.git +%endif +Source0: https://github.com/%{upstream}/%{realname}/archive/%{version}/%{realname}-%{version}.tar.gz +Patch1: erlang-merge_index-0001-Relax-dependencies.patch +Patch2: erlang-merge_index-0002-use-proper-version-in-app-file.patch BuildRequires: erlang-lager BuildRequires: erlang-rebar -# Error:erlang(lists:keyfind/3) in R12B and older -# Error:erlang(os:timestamp/0) in R12B and older -Requires: erlang-erts%{?_isa} >= R13B -Requires: erlang-kernel%{?_isa} -Requires: erlang-lager%{?_isa} -# Error:erlang(queue:member/2) in R12B and older -# Error:erlang(random:seed/1) in R12B and older -Requires: erlang-stdlib%{?_isa} >= R13B %description MergeIndex is an Erlang library for storing ordered sets on disk. It is very similar to an SSTable (in Google's Bigtable) or an HFile (in Hadoop). -Basho Technologies developed MergeIndex to serve as the underlying index storage -format for Riak Search and the upcoming Secondary Index functionality in Riak. - %prep -%setup -q -n %{upstream}-%{realname}-dd788df +%setup -q -n %{realname}-%{version} +%patch1 -p1 +%patch2 -p1 %build -rebar compile -v +%{rebar_compile} %install -mkdir -p %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/{ebin,include} -install -p -m 0644 ebin/%{realname}.app %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}.app -install -p -m 0644 ebin/*.beam %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/ebin -install -p -m 0644 include/*.hrl %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/include/ +mkdir -p %{buildroot}%{_erllibdir}/%{realname}-%{version}/{ebin,include} +install -m 644 ebin/%{realname}.app ebin/*.beam %{buildroot}%{_erllibdir}/%{realname}-%{version}/ebin +install -m 644 include/*.hrl %{buildroot}%{_erllibdir}/%{realname}-%{version}/include %check @@ -56,16 +49,15 @@ rebar eunit skip_deps=true -v %files -%doc LICENSE Notes.txt README.md -%dir %{_libdir}/erlang/lib/%{realname}-%{version}/ -%dir %{_libdir}/erlang/lib/%{realname}-%{version}/ebin/ -%dir %{_libdir}/erlang/lib/%{realname}-%{version}/include/ -%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}.app -%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/*.beam -%{_libdir}/erlang/lib/%{realname}-%{version}/include/*.hrl +%license LICENSE +%doc Notes.txt README.md +%{_erllibdir}/%{realname}-%{version} %changelog +* Sat Mar 5 2016 Peter Lemenkov - 2.1-1 +- Ver. 2.1 + * Wed Feb 03 2016 Fedora Release Engineering - 1.3.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 7da8fe1..530c25a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f9d2575d85753c3804b749ebd59e8579 basho-merge_index-1.3.0-0-g6005202.tar.gz +28222ad9492c6f75dda4035f8b6dbad9 merge_index-2.1.tar.gz