diff --git a/elixir.spec b/elixir.spec index 5ed82a7..00fee8d 100644 --- a/elixir.spec +++ b/elixir.spec @@ -1,12 +1,9 @@ %global upstream elixir-lang %global debug_package %{nil} -%global __with_rebar 0 -# We don't use rebar3 for now -%global __with_rebar3 1 Name: elixir Version: 1.13.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A modern approach to programming for the Erlang VM License: ASL 2.0 @@ -26,12 +23,7 @@ BuildRequires: erlang-inets BuildRequires: erlang-kernel BuildRequires: erlang-parsetools BuildRequires: erlang-public_key -%if %{__with_rebar} -BuildRequires: erlang-rebar -%endif -%if %{__with_rebar3} BuildRequires: erlang-rebar3 -%endif BuildRequires: erlang-sasl BuildRequires: erlang-stdlib BuildRequires: erlang-tools @@ -53,7 +45,6 @@ find -name ".build" -exec rm \{\} \; # Unpack elixir itself (Source0) %setup -q -D -#%patch1 -p1 # Remove windows-specific scripts find -name '*.bat' -exec rm \{\} \; @@ -69,47 +60,16 @@ find . -name .gitkeep -delete # Let the Makefile speak! sed -i '/^Q\s*:=/d' Makefile -rm -f ./lib/mix/test/fixtures/rebar ./lib/mix/test/fixtures/rebar3 -%if %{__with_rebar} -# Do nothing -%else -# Disable rebar-related tests (tests require both rebar and rebar3) -rm -f ./lib/mix/test/mix/rebar_test.exs -touch ./lib/mix/test/fixtures/rebar -%endif - -%if %{__with_rebar3} -# Do nothing -%else -# Disable rebar-related tests (tests require both rebar and rebar3) -rm -f ./lib/mix/test/mix/rebar_test.exs -touch ./lib/mix/test/fixtures/rebar3 -%endif - %build export LANG=C.UTF-8 -%if %{__with_rebar} -export REBAR=/usr/bin/rebar -export REBAR_DEPS_PREFER_LIBS=TRUE -%endif -%if %{__with_rebar3} export REBAR3=/usr/bin/rebar3 -%endif export ERL_LIBS=/usr/share/erlang/lib/ make compile make build_man -# FIXME not enough deps in Fedora -#make docs %check export LANG=C.UTF-8 -%if %{__with_rebar} -export REBAR=/usr/bin/rebar -export REBAR_DEPS_PREFER_LIBS=TRUE -%endif -%if %{__with_rebar3} export REBAR3=/usr/bin/rebar3 -%endif export ERL_LIBS=/usr/share/erlang/lib/ make test @@ -148,6 +108,9 @@ HTML documentation for eex, elixir, iex, logger and mix. %doc docs/doc/eex docs/doc/elixir docs/doc/iex docs/doc/logger docs/doc/mix %changelog +* Tue Aug 30 2022 Timothée Floure 1.13.4-3 +- Remove now useless rebar2-specific workaround from mix tests + * Thu Jul 21 2022 Fedora Release Engineering - 1.13.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild