Request 1967 (accepted)

Overview

Request 1967 (accepted)

Submission of erlang-relx

Created by vanmeeuwen about 7 years ago
In state accepted
Open review for Admin
Open review for kolab-developers

Submit erlang-relx

Submit package home:vanmeeuwen:kolab-17 / erlang-relx to package Kolab:Winterfell / erlang-relx

erlang-relx.spec Added

@@ -0,0 +1,149 @@
+%define bname relx
+Name:           erlang-%bname
+Version:        3.21.1
+Release:        1
+Summary:        A release assembler for Erlang
+License:        Apache-2.0
+Group:          Development/Tools/Other
+URL:            https://github.com/erlware/%bname
+Source:         %bname-%version.tar.xz
+
+Patch0:         %bname-%version-git.patch
+Patch1:         %bname-2.0.0-doc.patch
+
+Provides:       erlang-%bname = %version-%release
+
+BuildRequires:  erlang-rpm-macros
+BuildRequires:  erlang
+BuildRequires:  erlang-common_test
+BuildRequires:  erlang-erlware_commons >= 0.18.0
+BuildRequires:  erlang-providers >= 1.6.0
+BuildRequires:  erlang-rebar >= 2.6.1
+
+%description
+Relx assembles releases for an Erlang/OTP release. Given a release specification
+and a list of directories in which to search for OTP applications it will
+generate a release output. That output depends heavily on what plugins available
+and what options are defined, but usually it is simply a well configured release
+directory.
+The release-specification-file is optional but otherwise contains additional
+specification information for releases.
+
+
+%prep
+%setup -q -n %bname-%version
+%patch0 -p1
+%patch1 -p1
+sed -i -r '1s|^.*/env[[:blank:]]+(.*)$|#!%_bindir/\1|' priv/templates/install_upgrade_escript
+erl -noshell -eval '
+A = "src/%bname.app.src",
+{ok, [{application, %bname, L}]} = file:consult(A),
+file:write_file(A, io_lib:format("{application, %bname, ~p}.~n", [[{vsn, "%version"}|proplists:delete(vsn, L)]])),
+halt().'
+
+
+%build
+erl -noshell -eval '
+{ok, L} = file:consult("rebar.config"),
+file:write_file("%bname.rebar.config",
+                lists:map(fun(E) -> [io_lib:print(E), ".\n"] end,
+                          [{erl_opts, [slim, inline, no_debug_info, nowarn_deprecated_function|lists:delete(debug_info, proplists:get_value(erl_opts, L, []))]},
+                           {eunit_opts, [nowarn_deprecated_function|proplists:get_value(eunit_opts, L, [])]}
+                           |lists:foldl(fun proplists:delete/2, L, [deps, erl_opts, eunit_opts, cover_enabled])])),
+halt().'
+for c in compile doc; do
+	rebar -C %bname.rebar.config $c -v
+done
+cat > %bname.escript <<__EOF__
+#!/usr/bin/escript
+%%!-noinput
+main(X) -> relx:main(X).
+__EOF__
+
+
+%install
+install -d -m 0755 %buildroot%_otplibdir/%bname-%version/ebin
+install -p -m 0644 ebin/* %buildroot%_otplibdir/%bname-%version/ebin/
+install -d -m 0755 %buildroot%_otplibdir/%bname-%version/include
+install -p -m 0644 include/* %buildroot%_otplibdir/%bname-%version/include/
+install -d -m 0755 %buildroot%_otplibdir/%bname-%version/priv/templates
+for i in priv/templates/*; do
+	case $i in
+		*bin|*script) m="0755" ;;
+		*) m="0644" ;;
+	esac
+	install -p -m $m $i %buildroot%_otplibdir/%bname-%version/priv/templates/
+done
+install -d -m 0755 %buildroot%_otplibdir/%bname-%version/doc
+install -p -m 0644 doc/*.{css,html,png} %buildroot%_otplibdir/%bname-%version/doc/
+install -d -m 0755 %buildroot%_otplibdir/%bname-%version/examples
+install -p -m 0644 examples/* %buildroot%_otplibdir/%bname-%version/examples/
+install -d -m 0755 %buildroot%_docdir/%name
+ln -sf %_otplibdir/%bname-%version/doc %buildroot%_docdir/%name/html
+install -p -m 0644 README* CONTRIBUTING* %buildroot%_docdir/%name/
+install -pD -m 0755 %bname.escript %buildroot%_bindir/%bname
+
+
+%check
+rebar -C %bname.rebar.config eunit
+
+
+%files
+%defattr(-,root,root)
+%doc %_docdir/%name
+%_otplibdir/*
+%_bindir/*
+
+
+%changelog
+* Thu Oct 20 2016 Led <ledest@gmail.com> 3.21.1-1
+- 3.21.1
+- git 53a87ed
+
+* Fri Aug 26 2016 Led <ledest@gmail.com> 3.21.0-1
+- 3.21.0
+
+* Mon Jul 25 2016 Led <ledest@gmail.com> 3.20.0-1
+- 3.20.0
+
+* Sat Apr 02 2016 Led <ledest@gmail.com> 3.18.0-1
+- 3.18.0
+- git 1e15397
+
+* Sat Apr 02 2016 Led <ledest@gmail.com> 3.17.0-1
+- 3.17.0
+- clean up and update BuildRequires
+
+* Sun Feb 14 2016 Led <ledest@gmail.com> 3.15.0-1
+- 3.15.0
+
+* Sun Jan 17 2016 Led <ledest@gmail.com> 3.13.0-1
+- 3.13.0
+- add patches:
+  + relx-3.13.0-git.patch
+
+* Sun Nov 29 2015 Led <ledest@gmail.com> 3.9.0-1
+- 3.9.0
+- remove patches:
+  + relx-3.7.1-git.patch
+
+* Sun Oct 11 2015 Led <ledest@gmail.com> 3.7.1-1
+- 3.7.1
+
+* Fri Sep 04 2015 Led <ledest@gmail.com> 3.5.0-1
+- 3.5.0
+- add patches:
+  + relx-3.5.0-git.patch
+
+* Sat Jul 04 2015 Led <ledest@gmail.com> 3.1.0-1
+- 3.1.0
+- fix changelog
+
+* Sat Jul 04 2015 Led <ledest@gmail.com> 2.1.0-1
+- 2.1.0
+
+* Thu Jul 02 2015 Led <ledest@gmail.com> 2.0.0-2
+- fix build with Erlang 18
+
+* Sun May 31 2015 Led <ledest@gmail.com> 2.0.0-1
+- initial build

relx-2.0.0-doc.patch Added

@@ -0,0 +1,112 @@
+diff -Ndur relx-2.0.0/src/relx.erl relx-2.0.0-doc/src/relx.erl
+--- relx-2.0.0/src/relx.erl	2015-05-09 04:31:43.000000000 +0300
++++ relx-2.0.0-doc/src/relx.erl	2015-05-31 04:17:01.000000000 +0300
+@@ -79,8 +79,8 @@
+ 
+ %% @doc provides an API to run the Relx process from erlang applications
+ %%
+-%% @param RelName - The release name to build (maybe `undefined`)
+-%% @param RelVsn - The release version to build (maybe `undefined`)
++%% @param RelName - The release name to build (maybe `undefined')
++%% @param RelVsn - The release version to build (maybe `undefined')
+ %% @param Goals - The release goals for the system in depsolver or Relx goal
+ %% format
+ %% @param LibDirs - The library dirs that should be used for the system
+@@ -96,8 +96,8 @@
+ %% @doc provides an API to run the Relx process from erlang applications
+ %%
+ %% @param RootDir - The root directory for the project
+-%% @param RelName - The release name to build (maybe `undefined`)
+-%% @param RelVsn - The release version to build (maybe `undefined`)
++%% @param RelName - The release name to build (maybe `undefined')
++%% @param RelVsn - The release version to build (maybe `undefined')
+ %% @param Goals - The release goals for the system in depsolver or Relx goal
+ %% format
+ %% @param LibDirs - The library dirs that should be used for the system
+@@ -112,8 +112,8 @@
+ %% @doc provides an API to run the Relx process from erlang applications
+ %%
+ %% @param RootDir - The root directory for the system
+-%% @param RelName - The release name to build (maybe `undefined`)
+-%% @param RelVsn - The release version to build (maybe `undefined`)
++%% @param RelName - The release name to build (maybe `undefined')
++%% @param RelVsn - The release version to build (maybe `undefined')
+ %% @param Goals - The release goals for the system in depsolver or Relx goal
+ %% format
+ %% @param LibDirs - The library dirs that should be used for the system
+diff -Ndur relx-2.0.0/src/rlx_app_info.erl relx-2.0.0-doc/src/rlx_app_info.erl
+--- relx-2.0.0/src/rlx_app_info.erl	2015-05-09 04:31:43.000000000 +0300
++++ relx-2.0.0-doc/src/rlx_app_info.erl	2015-05-31 04:15:21.000000000 +0300
+@@ -21,18 +21,18 @@
+ %%% @doc This module represents useful, relevant information about an
+ %%% application. The relevant information is.
+ %%%
+-%%% <ul>
+-%%%  <li> Name - The application name as an atom </li>
+-%%%  <li> Vsn - The application version as a list </li>
+-%%%  <li> The root directory of the application. The directory that contains the
+-%%%  ebin/src/priv etc </li>
+-%%%  <li> Active Deps - The Active or 'application' dependencies of the OTP
++%%% &lt;ul&gt;
++%%%  &lt;li&gt; Name - The application name as an atom &lt;/li&gt;
++%%%  &lt;li&gt; Vsn - The application version as a list &lt;/li&gt;
++%%%  &lt;li&gt; The root directory of the application. The directory that contains the
++%%%  ebin/src/priv etc &lt;/li&gt;
++%%%  &lt;li&gt; Active Deps - The Active or 'application' dependencies of the OTP
+ %%%  App. That is the things in the 'applications' property of the application
+-%%%  metadata </li>
+-%%%  <li> Library Deps - The Inactive or Library dependencies of the ATP
++%%%  metadata &lt;/li&gt;
++%%%  &lt;li&gt; Library Deps - The Inactive or Library dependencies of the ATP
+ %%%  app. That is the things in the 'included_applications property of the
+ %%%  application metadata.
+-%%%  </ul>
++%%%  &lt;/ul&gt;
+ %%%
+ -module(rlx_app_info).
+ 
+diff -Ndur relx-2.0.0/src/rlx_depsolver.erl relx-2.0.0-doc/src/rlx_depsolver.erl
+--- relx-2.0.0/src/rlx_depsolver.erl	2015-05-09 04:31:43.000000000 +0300
++++ relx-2.0.0-doc/src/rlx_depsolver.erl	2015-05-31 04:32:40.437766702 +0300
+@@ -112,11 +112,7 @@
+ %%============================================================================
+ %% type
+ %%============================================================================
+--ifdef(namespaced_types).
+ -type dep_graph() :: gb_tree:tree().
+--else.
+--type dep_graph() :: gb_tree().
+--endif.
+ -opaque t() :: {?MODULE, dep_graph()}.
+ -type pkg() :: {pkg_name(), vsn()}.
+ -type pkg_name() :: string() | binary() | atom().
+@@ -334,7 +330,7 @@
+ %% could not be satisified. These may also have versions attached.
+ %% Example:
+ %%
+-%%    ```(foo = 1.2.0), bar```
++%%    ```(foo = 1.2.0), bar'''
+ %%
+ -spec format_roots([constraints()]) -> iolist().
+ format_roots(Roots) ->
+@@ -344,7 +340,7 @@
+ %% @doc Return a formatted list of the culprit depenedencies which led to
+ %% the dependencies not being satisfied. Example:
+ %%
+-%%     ```(foo = 1.2.0) -> (bar > 2.0.0)```
++%%     ```(foo = 1.2.0) -> (bar > 2.0.0)'''
+ -spec format_culprits([{[constraint()], [constraint()]}]) -> iolist().
+ format_culprits(Culprits) ->
+     rlx_depsolver_culprit:format_culprits(Culprits).
+diff -Ndur relx-2.0.0/src/rlx_release.erl relx-2.0.0-doc/src/rlx_release.erl
+--- relx-2.0.0/src/rlx_release.erl	2015-05-09 04:31:43.000000000 +0300
++++ relx-2.0.0-doc/src/rlx_release.erl	2015-05-31 04:13:48.000000000 +0300
+@@ -181,7 +181,7 @@
+             ?RLX_ERROR({not_realized, Name, Vsn})
+     end.
+ 
+-%% @doc produce the canonical name (<name>-<vsn>) for this release
++%% @doc produce the canonical name (&lt;name&gt;-&lt;vsn&gt;) for this release
+ -spec canonical_name(t()) -> string().
+ canonical_name(#release_t{name=Name, vsn=Vsn}) ->
+     erlang:binary_to_list(erlang:iolist_to_binary([erlang:atom_to_list(Name), "-",

relx-3.21.1-git.patch Added

@@ -0,0 +1,26 @@
+diff --git a/src/rlx_prv_assembler.erl b/src/rlx_prv_assembler.erl
+index 1f64886..030a9b3 100644
+--- a/src/rlx_prv_assembler.erl
++++ b/src/rlx_prv_assembler.erl
+@@ -507,7 +507,11 @@ include_erts(State, Release, OutputDir, RelDir) ->
+                         true -> ok;
+                         false ->
+                             SrcDir = filename:join([LocalErts, "src"]),
+-                            ok = ec_file:remove(SrcDir, [recursive])
++                            %% ensure the src folder exists before deletion
++                            case ec_file:exists(SrcDir) of
++                              true -> ok = ec_file:remove(SrcDir, [recursive]);
++                              false -> ok
++                            end
+                     end,
+ 
+                     case rlx_state:get(State, extended_start_script, false) of
+@@ -567,7 +571,7 @@ make_boot_script_variables(State) ->
+     % (dictated by erl.ini [erlang] Rootdir=) and so a boot variable is made
+     % pointing to the release directory
+     % On non-Windows, $ROOT is set by the ROOTDIR environment variable as the
+-    % release directory, so a boot variable is made pointing to the erts 
++    % release directory, so a boot variable is made pointing to the erts
+     % directory.
+     % NOTE the boot variable can point to either the release/erts root directory
+     % or the release/erts lib directory, as long as the usage here matches the

relx-3.21.1.tar.xz Added

Build Results
RPM Lint

Refresh

Comments for request 1967 0

Request History

vanmeeuwen created request about 7 years ago

Submission of erlang-relx

timotheus accepted request about 7 years ago

looks good