From df85d6d14a7174d295c407e9f715047e91ea14df Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Feb 02 2022 20:40:47 +0000 Subject: Update to rebar3 3.18.0 Signed-off-by: Peter Lemenkov --- diff --git a/.gitignore b/.gitignore index 4328e25..2c56df2 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /rebar3-3.11.1.tar.gz /rebar3-3.13.1.tar.gz /rebar3-3.14.3.tar.gz +/rebar3-3.18.0.tar.gz diff --git a/erlang-rebar3-0001-Skip-deps.patch b/erlang-rebar3-0001-Skip-deps.patch index 15ca41b..8675b89 100644 --- a/erlang-rebar3-0001-Skip-deps.patch +++ b/erlang-rebar3-0001-Skip-deps.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Skip deps Signed-off-by: Peter Lemenkov diff --git a/bootstrap b/bootstrap -index cd41321f..d35e6e74 100755 +index 4564ae8f..6a20de6f 100755 --- a/bootstrap +++ b/bootstrap -@@ -31,17 +31,6 @@ main(_) -> +@@ -31,15 +31,6 @@ main(_) -> os:putenv("REBAR_PROFILE", "bootstrap"), compile_vendored(), @@ -17,16 +17,14 @@ index cd41321f..d35e6e74 100755 - ,{getopt, []} - ,{cf, []} - ,{erlware_commons, ["ec_dictionary.erl", "ec_vsn.erl"]} -- ,{parse_trans, ["parse_trans.erl", "parse_trans_pp.erl", -- "parse_trans_codegen.erl"]} -- ,{certifi, []}], +- ,{certifi, ["certifi_pt.erl"]}], - Deps = get_deps(), - [fetch_and_compile(Dep, Deps) || Dep <- BaseDeps], - %% Build rebar3 modules with compile:file bootstrap_rebar3(), -@@ -63,7 +52,6 @@ main(_) -> +@@ -61,7 +52,6 @@ main(_) -> code:add_pathsa(DepsPaths), rebar3:run(["clean", "-a"]), @@ -35,69 +33,65 @@ index cd41321f..d35e6e74 100755 %% Done with compile, can turn back on error logger error_logger:tty(true). diff --git a/rebar.config b/rebar.config -index 0ed42c77..a820bf11 100644 +index f286e0a0..20ac5b3a 100644 --- a/rebar.config +++ b/rebar.config -@@ -1,18 +1,6 @@ +@@ -1,17 +1,6 @@ %% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*- %% ex: ts=4 sw=4 ft=erlang et --{deps, [{erlware_commons, "1.3.1"}, -- {ssl_verify_fun, "1.1.6"}, -- {certifi, "2.5.2"}, -- {parse_trans, "3.3.0"}, % force otp-21 compat -- {providers, "1.8.1"}, -- {getopt, "1.0.1"}, -- {bbmustache, "1.10.0"}, -- {relx, "4.2.0"}, -- {cf, "0.3.1"}, -- {cth_readable, "1.4.9"}, -- {eunit_formatters, "0.5.0"}]}. +-{deps, [{erlware_commons, "1.5.0"}, +- {ssl_verify_fun, "1.1.6"}, +- {certifi, "2.8.0"}, +- {providers, "1.9.0"}, +- {getopt, "1.0.1"}, +- {bbmustache, "1.12.2"}, +- {relx, "4.6.0"}, +- {cf, "0.3.1"}, +- {cth_readable, "1.5.1"}, +- {eunit_formatters, "0.5.0"}]}. - {post_hooks, [{"(linux|darwin|solaris|freebsd|netbsd|openbsd)", escriptize, "cp \"$REBAR_BUILD_DIR/bin/rebar3\" ./rebar3"}, diff --git a/rebar.lock b/rebar.lock deleted file mode 100644 -index 8355e9e5..00000000 +index bc5d0ce5..00000000 --- a/rebar.lock +++ /dev/null -@@ -1,38 +0,0 @@ +@@ -1,35 +0,0 @@ -{"1.2.0", --[{<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.10.0">>},0}, -- {<<"certifi">>,{pkg,<<"certifi">>,<<"2.5.2">>},0}, +-[{<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.12.2">>},0}, +- {<<"certifi">>,{pkg,<<"certifi">>,<<"2.8.0">>},0}, - {<<"cf">>,{pkg,<<"cf">>,<<"0.3.1">>},0}, -- {<<"cth_readable">>,{pkg,<<"cth_readable">>,<<"1.4.9">>},0}, -- {<<"erlware_commons">>,{pkg,<<"erlware_commons">>,<<"1.3.1">>},0}, +- {<<"cth_readable">>,{pkg,<<"cth_readable">>,<<"1.5.1">>},0}, +- {<<"erlware_commons">>,{pkg,<<"erlware_commons">>,<<"1.5.0">>},0}, - {<<"eunit_formatters">>,{pkg,<<"eunit_formatters">>,<<"0.5.0">>},0}, - {<<"getopt">>,{pkg,<<"getopt">>,<<"1.0.1">>},0}, -- {<<"parse_trans">>,{pkg,<<"parse_trans">>,<<"3.3.0">>},0}, -- {<<"providers">>,{pkg,<<"providers">>,<<"1.8.1">>},0}, -- {<<"relx">>,{pkg,<<"relx">>,<<"4.2.0">>},0}, +- {<<"providers">>,{pkg,<<"providers">>,<<"1.9.0">>},0}, +- {<<"relx">>,{pkg,<<"relx">>,<<"4.6.0">>},0}, - {<<"ssl_verify_fun">>,{pkg,<<"ssl_verify_fun">>,<<"1.1.6">>},0}]}. -[ -{pkg_hash,[ -- {<<"bbmustache">>, <<"DDC927463F0E95D66CDAC889153AF08015D609124D6D79006C248AD2DE7F6ECD">>}, -- {<<"certifi">>, <<"B7CFEAE9D2ED395695DD8201C57A2D019C0C43ECAF8B8BCB9320B40D6662F340">>}, +- {<<"bbmustache">>, <<"0CABDCE0DB9FE6D3318131174B9F2B351328A4C0AFBEB3E6E99BB0E02E9B621D">>}, +- {<<"certifi">>, <<"D4FB0A6BB20B7C9C3643E22507E42F356AC090A1DCEA9AB99E27E0376D695EBA">>}, - {<<"cf">>, <<"5CB902239476E141EA70A740340233782D363A31EEA8AD37049561542E6CD641">>}, -- {<<"cth_readable">>, <<"034FB69795F11061980ECB62B40EF51DC10D4AC115B98FDB2C0CC71D851FBF98">>}, -- {<<"erlware_commons">>, <<"0CE192AD69BC6FD0880246D852D0ECE17631E234878011D1586E053641ED4C04">>}, +- {<<"cth_readable">>, <<"F511EFCFDE04A48B014A9197FFF1B4C4860E4E35CDB8E2F3AE3C4178E20299B1">>}, +- {<<"erlware_commons">>, <<"918C56D8FB3BE52AF0DF138ED6E0755E764AD4467CD7D025761F7D0A17D3DEC1">>}, - {<<"eunit_formatters">>, <<"6A9133943D36A465D804C1C5B6E6839030434B8879C5600D7DDB5B3BAD4CCB59">>}, - {<<"getopt">>, <<"C73A9FA687B217F2FF79F68A3B637711BB1936E712B521D8CE466B29CBF7808A">>}, -- {<<"parse_trans">>, <<"09765507A3C7590A784615CFD421D101AEC25098D50B89D7AA1D66646BC571C1">>}, -- {<<"providers">>, <<"70B4197869514344A8A60E2B2A4EF41CA03DEF43CFB1712ECF076A0F3C62F083">>}, -- {<<"relx">>, <<"493E34AD009DAAE0C0A6D38F6FFBF45CA8DEF705B01FFF97A00FB4DA08319D34">>}, +- {<<"providers">>, <<"46F6645B0C677B1029E02B013BFD69092A2232854DAF359F2378FA42AC0BEC0D">>}, +- {<<"relx">>, <<"939DB831A63CC35A7850C99DCC758FE9F3900E32E1DAB7CBB34E5306CAF53168">>}, - {<<"ssl_verify_fun">>, <<"CF344F5692C82D2CD7554F5EC8FD961548D4FD09E7D22F5B62482E5AEAEBD4B0">>}]}, -{pkg_hash_ext,[ -- {<<"bbmustache">>, <<"43EFFA3FD4BB9523157AF5A9E2276C493495B8459FC8737144AA186CB13CE2EE">>}, -- {<<"certifi">>, <<"3B3B5F36493004AC3455966991EAF6E768CE9884693D9968055AEEEB1E575040">>}, +- {<<"bbmustache">>, <<"688B33A4D5CC2D51F575ADF0B3683FC40A38314A2F150906EDCFC77F5B577B3B">>}, +- {<<"certifi">>, <<"6AC7EFC1C6F8600B08D625292D4BBF584E14847CE1B6B5C44D983D273E1097EA">>}, - {<<"cf">>, <<"315E8D447D3A4B02BCDBFA397AD03BBB988A6E0AA6F44D3ADD0F4E3C3BF97672">>}, -- {<<"cth_readable">>, <<"B4C6ABABDB046C5F2FBB3C22F030B4C5A679083956DCDD29C1DF0CB30B18DA24">>}, -- {<<"erlware_commons">>, <<"7AADA93F368D0A0430122E39931B7FB4AC9E94DBF043CDC980AD4330FD9CD166">>}, +- {<<"cth_readable">>, <<"686541A22EFE6CA5A41A047B39516C2DD28FB3CADE5F24A2F19145B3967F9D80">>}, +- {<<"erlware_commons">>, <<"3E7C6FB2BA4C29B0DD5DFE9D031B66449E2088ECEC1A81465BD9FDE05ED7D0DB">>}, - {<<"eunit_formatters">>, <<"D6C8BA213424944E6E05BBC097C32001CDD0ABE3925D02454F229B20D68763C9">>}, - {<<"getopt">>, <<"53E1AB83B9CEB65C9672D3E7A35B8092E9BDC9B3EE80721471A161C10C59959C">>}, -- {<<"parse_trans">>, <<"17EF63ABDE837AD30680EA7F857DD9E7CED9476CDD7B0394432AF4BFC241B960">>}, -- {<<"providers">>, <<"E45745ADE9C476A9A469EA0840E418AB19360DC44F01A233304E118A44486BA0">>}, -- {<<"relx">>, <<"95FA4BF3B1FF2E04033504602BEF72F8F3EB6A90608191CB2D7C0E7E54D0D1FF">>}, +- {<<"providers">>, <<"D287E874406A1505608642B0A3DB5B68D6ADA3F2AB001AEC87E7F4D7C79FC017">>}, +- {<<"relx">>, <<"2FF8131C63093C621C6B37DC52D1B2848A938886584B4B701D35BDBE4377F509">>}, - {<<"ssl_verify_fun">>, <<"BDB0D2471F453C88FF3908E7686F86F9BE327D065CC1EC16FA4540197EA04680">>}]} -]. diff --git a/erlang-rebar3.spec b/erlang-rebar3.spec index ecac694..d09601f 100644 --- a/erlang-rebar3.spec +++ b/erlang-rebar3.spec @@ -5,8 +5,8 @@ %global bootstrap 1 Name: erlang-%{realname} -Version: 3.14.3 -Release: 4%{?dist} +Version: 3.18.0 +Release: 1%{?dist} Summary: Tool for working with Erlang projects License: ASL 2.0 and MIT URL: https://github.com/erlang/%{realname} @@ -75,6 +75,9 @@ install -p -m644 manpages/%{realname}.1 %{buildroot}%{_mandir}/man1/ %{_mandir}/man1/%{realname}.1* %changelog +* Wed Feb 2 2022 Peter Lemenkov - 3.18.0-1 +- New upstream release + * Thu Jan 20 2022 Fedora Release Engineering - 3.14.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index efd99b6..63eed12 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rebar3-3.14.3.tar.gz) = e4324b2a1454b60c15c1160b44cdd58856e199fdb711ae018e0f141136b5946366336d5c7ce9fc5fbfb45dbfc9bf1c765a20de5e4f342f5a6ade9681d5192e12 +SHA512 (rebar3-3.18.0.tar.gz) = 4fcaa1867fba7462df0b9a64fa442f4a887e83530635fdcd19f4b5dcee14ace3e7403c27f35e5e6055fb6bf89c98a91a3ff1e2036ab6e67e3de028f91233e4ed