diff --git a/Disable-no-support-local-erlang-version-test.patch b/Disable-no-support-local-erlang-version-test.patch new file mode 100644 index 0000000..3dda6f0 --- /dev/null +++ b/Disable-no-support-local-erlang-version-test.patch @@ -0,0 +1,29 @@ +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.8.1-doc.zip b/elixir-1.8.1-doc.zip deleted file mode 100644 index 833870a..0000000 Binary files a/elixir-1.8.1-doc.zip and /dev/null differ diff --git a/elixir-1.8.1.tar.gz b/elixir-1.8.1.tar.gz deleted file mode 100644 index 1f1c350..0000000 Binary files a/elixir-1.8.1.tar.gz and /dev/null differ diff --git a/elixir-1.9.0-doc.zip b/elixir-1.9.0-doc.zip new file mode 100644 index 0000000..b4b594b Binary files /dev/null and b/elixir-1.9.0-doc.zip differ diff --git a/elixir-1.9.0.tar.gz b/elixir-1.9.0.tar.gz new file mode 100644 index 0000000..dfc3bdd Binary files /dev/null and b/elixir-1.9.0.tar.gz differ diff --git a/elixir.spec b/elixir.spec index d790d29..cde9400 100644 --- a/elixir.spec +++ b/elixir.spec @@ -1,13 +1,24 @@ %global debug_package %{nil} +%global __with_rebar 1 +%global __with_rebar3 0 Name: elixir -Version: 1.8.1 +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 -BuildRequires: erlang-rebar git sed +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 +%if %{__with_rebar} +BuildRequires: erlang-rebar +%endif %{__with_rebar} +%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 %description @@ -19,22 +30,47 @@ 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 find . -name .gitkeep -delete -sed -i 's/$(Q)//g' Makefile +sed -i '/^Q\s*:=/d' Makefile +rm -f ./lib/mix/test/fixtures/rebar ./lib/mix/test/fixtures/rebar3 +%if %{__with_rebar} +%else +rm -f ./lib/mix/test/mix/rebar_test.exs +touch ./lib/mix/test/fixtures/rebar +%endif %{__with_rebar} +%if %{__with_rebar3} +%else +rm -f ./lib/mix/test/mix/rebar_test.exs +touch ./lib/mix/test/fixtures/rebar3 +%endif %{__with_rebar3} %build export LANG=C.UTF-8 +%if %{__with_rebar} export REBAR=/usr/bin/rebar -export ERL_LIBS=/usr/share/erlang/lib/ export REBAR_DEPS_PREFER_LIBS=TRUE +%endif %{__with_rebar} +%if %{__with_rebar3} +export REBAR3=/usr/bin/rebar3 +%endif %{__with_rebar3} +export ERL_LIBS=/usr/share/erlang/lib/ make compile make build_man %check export LANG=C.UTF-8 +%if %{__with_rebar} +export REBAR=/usr/bin/rebar +export REBAR_DEPS_PREFER_LIBS=TRUE +%endif %{__with_rebar} +%if %{__with_rebar3} +export REBAR3=/usr/bin/rebar3 +%endif %{__with_rebar3} +export ERL_LIBS=/usr/share/erlang/lib/ make test %install @@ -68,5 +104,8 @@ 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 Sep 19 2020 huanghaitao - 1.9.0-1 +- Update to fix test errors + * Fri Aug 28 2020 wutao - 1.8.1-1 - Package init