diff --git a/Disable-no-support-local-erlang-version-test.patch b/Disable-no-support-local-erlang-version-test.patch deleted file mode 100644 index 3dda6f0..0000000 --- a/Disable-no-support-local-erlang-version-test.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0745090bb60982ac2c332bd8ded3c53adf339f45 Mon Sep 17 00:00:00 2001 -From: hht8 -Date: Sat, 19 Sep 2020 17:52:58 +0800 -Subject: [PATCH] Disable no support local erlang version test - -https://github.com/elixir-lang/elixir/issues/9173 -disable this test to compat local erlang version. ---- - lib/mix/test/mix/tasks/release_test.exs | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/lib/mix/test/mix/tasks/release_test.exs b/lib/mix/test/mix/tasks/release_test.exs -index 834ae77..6fb3d84 100644 ---- a/lib/mix/test/mix/tasks/release_test.exs -+++ b/lib/mix/test/mix/tasks/release_test.exs -@@ -307,10 +307,6 @@ defmodule Mix.Tasks.ReleaseTest do - assert String.trim_trailing(version) == "eval 0.1.0" - refute File.exists?(Path.join(root, "RELEASE_BOOTED")) - -- {hello_world, 0} = System.cmd(script, ["eval", "IO.puts :hello_world"]) -- assert String.trim_trailing(hello_world) == "hello_world" -- refute File.exists?(Path.join(root, "RELEASE_BOOTED")) -- - open_port(script, ['eval', 'Application.ensure_all_started(:release_test)']) - - assert %{ --- -2.23.0 - diff --git a/elixir-1.12.0-doc.zip b/elixir-1.12.0-doc.zip new file mode 100644 index 0000000..218c7df Binary files /dev/null and b/elixir-1.12.0-doc.zip differ diff --git a/elixir-1.12.0.tar.gz b/elixir-1.12.0.tar.gz new file mode 100644 index 0000000..40ba4e4 Binary files /dev/null and b/elixir-1.12.0.tar.gz differ diff --git a/elixir-1.9.0-doc.zip b/elixir-1.9.0-doc.zip deleted file mode 100644 index b4b594b..0000000 Binary files a/elixir-1.9.0-doc.zip and /dev/null differ diff --git a/elixir-1.9.0.tar.gz b/elixir-1.9.0.tar.gz deleted file mode 100644 index dfc3bdd..0000000 Binary files a/elixir-1.9.0.tar.gz and /dev/null differ diff --git a/elixir.spec b/elixir.spec index cde9400..1540b7f 100644 --- a/elixir.spec +++ b/elixir.spec @@ -1,26 +1,27 @@ %global debug_package %{nil} %global __with_rebar 1 %global __with_rebar3 0 -Name: elixir -Version: 1.9.0 -Release: 1 -Summary: A modern approach to programming for the Erlang VM -License: ASL 2.0 -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 -Patch0000: Disable-no-support-local-erlang-version-test.patch -BuildRequires: erlang-compiler erlang-crypto erlang-dialyzer erlang-erts erlang-eunit -BuildRequires: erlang-inets erlang-kernel erlang-parsetools erlang-public_key +Name: elixir +Version: 1.12.0 +Release: 1 +Summary: A modern approach to programming for the Erlang VM +License: ASL 2.0 +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 +BuildRequires: erlang-compiler erlang-crypto erlang-dialyzer erlang-erts erlang-eunit +BuildRequires: erlang-inets erlang-kernel erlang-parsetools erlang-public_key %if %{__with_rebar} -BuildRequires: erlang-rebar -%endif %{__with_rebar} +BuildRequires: erlang-rebar +%endif %if %{__with_rebar3} -BuildRequires: erlang-rebar3 -%endif %{__with_rebar3} -BuildRequires: erlang-stdlib erlang-tools erlang-xmerl git sed -Requires: erlang-compiler erlang-crypto erlang-erts erlang-inets erlang-kernel -Requires: erlang-parsetools erlang-public_key erlang-stdlib erlang-tools +BuildRequires: erlang-rebar3 +%endif +BuildRequires: erlang-sasl make +BuildRequires: erlang-stdlib erlang-tools erlang-xmerl git sed +Requires: erlang-compiler erlang-crypto erlang-erts erlang-inets erlang-kernel +Requires: erlang-parsetools erlang-public_key erlang-stdlib erlang-tools erlang-sasl + %description Elixir is a programming language built on top of the Erlang VM. As Erlang, it is a functional language built to support distributed, @@ -30,7 +31,6 @@ fault-tolerant, non-stop applications with hot code swapping. %setup -q -T -c -n %{name}-%{version}/docs -a 1 find -name ".build" -exec rm \{\} \; %setup -q -D -%patch0000 -p1 find -name '*.bat' -exec rm \{\} \; rm lib/elixir/test/elixir/io/ansi_test.exs find . -name .gitignore -delete @@ -38,25 +38,27 @@ find . -name .gitkeep -delete sed -i '/^Q\s*:=/d' Makefile rm -f ./lib/mix/test/fixtures/rebar ./lib/mix/test/fixtures/rebar3 %if %{__with_rebar} +# Do nothing %else rm -f ./lib/mix/test/mix/rebar_test.exs touch ./lib/mix/test/fixtures/rebar -%endif %{__with_rebar} +%endif %if %{__with_rebar3} +# Do nothing %else rm -f ./lib/mix/test/mix/rebar_test.exs touch ./lib/mix/test/fixtures/rebar3 -%endif %{__with_rebar3} +%endif %build export LANG=C.UTF-8 %if %{__with_rebar} export REBAR=/usr/bin/rebar export REBAR_DEPS_PREFER_LIBS=TRUE -%endif %{__with_rebar} +%endif %if %{__with_rebar3} export REBAR3=/usr/bin/rebar3 -%endif %{__with_rebar3} +%endif export ERL_LIBS=/usr/share/erlang/lib/ make compile make build_man @@ -66,10 +68,10 @@ export LANG=C.UTF-8 %if %{__with_rebar} export REBAR=/usr/bin/rebar export REBAR_DEPS_PREFER_LIBS=TRUE -%endif %{__with_rebar} +%endif %if %{__with_rebar3} export REBAR3=/usr/bin/rebar3 -%endif %{__with_rebar3} +%endif export ERL_LIBS=/usr/share/erlang/lib/ make test @@ -94,8 +96,9 @@ cp -a man/elixir.1 man/elixirc.1 man/iex.1 man/mix.1 %{buildroot}/%{_mandir}/man %{_mandir}/man1/mix.1* %package doc -License: ASL 2.0 -Summary: Documentation for the elixir language and tools +License: ASL 2.0 +Summary: Documentation for the elixir language and tools + %description doc HTML documentation for eex, elixir, iex, logger and mix. @@ -104,6 +107,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 Jan 18 2022 Ge Wang - 1.12.0-1 +- Update to version 1.12.0 + * Sat Sep 19 2020 huanghaitao - 1.9.0-1 - Update to fix test errors