Rebar ver. 2.6.4

- Ver. 2.6.4 (rhbz#1350988)
- Re-enable upstream behaviour for get-deps (rhbz#999054)
- Added erlang-eflame dependency

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
This commit is contained in:
Peter Lemenkov 2016-09-02 17:38:59 +03:00
parent 915ee4c8e4
commit 2b3f6c608c
1 changed files with 12 additions and 5 deletions

View File

@ -5,14 +5,14 @@
# Set this to true when starting a rebuild of the whole erlang stack. There's # Set this to true when starting a rebuild of the whole erlang stack. There's
# a cyclical dependency between erlang-rebar and erlang-getopt so this package # a cyclical dependency between erlang-rebar and erlang-getopt so this package
# (rebar) needs to get built first in bootstrap mode. # (rebar) needs to get built first in bootstrap mode.
%global need_bootstrap_set 1 %global need_bootstrap_set 0
%{!?need_bootstrap: %global need_bootstrap %{need_bootstrap_set}} %{!?need_bootstrap: %global need_bootstrap %{need_bootstrap_set}}
Name: erlang-%{realname} Name: erlang-%{realname}
Version: 2.6.4 Version: 2.6.4
Release: 1%{?dist} Release: 2%{?dist}
Summary: Erlang Build Tools Summary: Erlang Build Tools
Group: Development/Tools Group: Development/Tools
License: MIT License: MIT
@ -45,6 +45,8 @@ Patch11: rebar-0011-Allow-ignoring-missing-deps.patch
%if 0%{?need_bootstrap} < 1 %if 0%{?need_bootstrap} < 1
BuildRequires: erlang-rebar BuildRequires: erlang-rebar
# FIXME remove later and revisit getopt<->rebar bootstrapping
BuildRequires: erlang-getopt
%else %else
BuildRequires: erlang-asn1 BuildRequires: erlang-asn1
BuildRequires: erlang-common_test BuildRequires: erlang-common_test
@ -115,9 +117,6 @@ Erlang Build Tools.
%build %build
%if 0%{?need_bootstrap} < 1 %if 0%{?need_bootstrap} < 1
%{erlang_compile} %{erlang_compile}
# For using during tests
install -D -p -m 0755 %{SOURCE1} ./rebar
sed -i -e "s,-noshell -noinput,-noshell -noinput -pa %{buildroot}%{_erllibdir}/%{realname}-%{version}/ebin,g" ./rebar
%else %else
./bootstrap ./bootstrap
./rebar compile -v ./rebar compile -v
@ -134,6 +133,9 @@ cp -a priv %{buildroot}%{_erllibdir}/%{realname}-%{version}/
%check %check
%if 0%{?need_bootstrap} < 1 %if 0%{?need_bootstrap} < 1
# For using during tests
install -D -p -m 0755 %{SOURCE1} ./rebar
sed -i -e "s,-noshell -noinput,-noshell -noinput -pa .,g" ./rebar
%{rebar_eunit} %{rebar_eunit}
%endif %endif
@ -146,6 +148,11 @@ cp -a priv %{buildroot}%{_erllibdir}/%{realname}-%{version}/
%changelog %changelog
* Thu Sep 1 2016 Peter Lemenkov <lemenkov@gmail.com> - 2.6.4-2
- Ver. 2.6.4 (rhbz#1350988)
- Re-enable upstream behaviour for get-deps (rhbz#999054)
- Added erlang-eflame dependency
* Thu Sep 1 2016 Peter Lemenkov <lemenkov@gmail.com> - 2.6.4-1 * Thu Sep 1 2016 Peter Lemenkov <lemenkov@gmail.com> - 2.6.4-1
- Bootstrap ver. 2.6.4 (rhbz#1350988) - Bootstrap ver. 2.6.4 (rhbz#1350988)
- Re-enable upstream behaviour for get-deps (rhbz#999054) - Re-enable upstream behaviour for get-deps (rhbz#999054)