diff --git a/SPECS/elixir.spec b/SPECS/elixir.spec index ae7fbb8..3c25990 100644 --- a/SPECS/elixir.spec +++ b/SPECS/elixir.spec @@ -5,7 +5,7 @@ Name: elixir Version: 1.12.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A modern approach to programming for the Erlang VM License: ASL 2.0 @@ -13,6 +13,7 @@ URL: http://elixir-lang.org/ Source0: https://github.com/elixir-lang/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: https://github.com/elixir-lang/%{name}/releases/download/v%{version}/Docs.zip#/%{name}-%{version}-doc.zip +Patch1: elixir-0001-Fix-elixir-test-assertion-for-erlang-OTP-24.1-11309.patch # See https://bugzilla.redhat.com/1470583 #BuildArch: noarch BuildRequires: erlang-compiler @@ -63,6 +64,7 @@ find -name ".build" -exec rm \{\} \; # Unpack elixir itself (Source0) %setup -q -D +%patch1 -p1 # Remove windows-specific scripts find -name '*.bat' -exec rm \{\} \; @@ -155,6 +157,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 +* Sat Nov 6 2021 Peter Lemenkov - 1.12.3-3 +- Fix FTBFS with Erlang 24.1 (see GH#11309) + * Fri Sep 24 2021 Timothée Floure - 1.12.3-1 - New upstream release diff --git a/elixir-0001-Fix-elixir-test-assertion-for-erlang-OTP-24.1-11309.patch b/elixir-0001-Fix-elixir-test-assertion-for-erlang-OTP-24.1-11309.patch new file mode 100644 index 0000000..dd2a58e --- /dev/null +++ b/elixir-0001-Fix-elixir-test-assertion-for-erlang-OTP-24.1-11309.patch @@ -0,0 +1,26 @@ +From: jendis <41624531+jendis@users.noreply.github.com> +Date: Wed, 13 Oct 2021 23:48:14 +0200 +Subject: [PATCH] Fix elixir test assertion for erlang >=OTP-24.1 (#11309) + + +diff --git a/lib/elixir/test/elixir/exception_test.exs b/lib/elixir/test/elixir/exception_test.exs +index 6242194f7..c7d2f1a56 100644 +--- a/lib/elixir/test/elixir/exception_test.exs ++++ b/lib/elixir/test/elixir/exception_test.exs +@@ -470,11 +470,12 @@ test "annotates undefined function error with suggestions" do + * min/1 + """ + +- assert blame_message(:erlang, & &1.gt_cookie()) == """ +- function :erlang.gt_cookie/0 is undefined or private. Did you mean one of: ++ assert blame_message(:erlang, & &1.hal()) == """ ++ function :erlang.hal/0 is undefined or private. Did you mean one of: + +- * get_cookie/0 +- * set_cookie/2 ++ * halt/0 ++ * halt/1 ++ * halt/2 + """ + end +