Ver. 2.0.0
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
This commit is contained in:
parent
1cc7cddf13
commit
553c57cc8a
|
@ -1,2 +1,3 @@
|
|||
/basho-rebar-RELEASE-1-327-g90058c7.tar.gz
|
||||
/basho-rebar-RELEASE-1-821-g635d1a9.tar.gz
|
||||
/basho-rebar-2.0.0-0-g1c98f6c.tar.gz
|
||||
|
|
|
@ -1,33 +1,34 @@
|
|||
%global realname rebar
|
||||
%global upstream basho
|
||||
%global debug_package %{nil}
|
||||
%global git_tag 635d1a9
|
||||
%global patchnumber 821
|
||||
%global git_tag 1c98f6c
|
||||
%global patchnumber 0
|
||||
|
||||
|
||||
Name: erlang-%{realname}
|
||||
Version: 2
|
||||
Release: 9.20120514git%{git_tag}%{?dist}
|
||||
Version: 2.0.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Erlang Build Tools
|
||||
Group: Development/Tools
|
||||
License: MIT
|
||||
URL: https://github.com/basho/rebar
|
||||
# wget --no-check-certificate --content-disposition https://github.com/basho/rebar/zipball/635d1a9
|
||||
Source0: %{upstream}-%{realname}-RELEASE-1-%{patchnumber}-g%{git_tag}.tar.gz
|
||||
Source0: %{upstream}-%{realname}-%{version}-%{patchnumber}-g%{git_tag}.tar.gz
|
||||
Source1: rebar.escript
|
||||
Patch1: rebar-0001-No-need-to-create-bundle.patch
|
||||
Patch2: rebar-0002-Remove-bundled-mustache.patch
|
||||
Patch3: rebar-0003-Remove-bundled-getopt.patch
|
||||
Patch4: rebar-0004-Allow-discarding-building-ports.patch
|
||||
# R12B - EPEL5-specific
|
||||
Patch4: rebar-0004-No-erlang-min-2-and-erlang-max-2-in-R12B.patch
|
||||
Patch5: rebar-0005-No-erlang-min-2-and-erlang-max-2-in-R12B.patch
|
||||
# R12B - EPEL5-specific
|
||||
Patch5: rebar-0005-No-such-function-lists-keyfind-3-in-R12B5-use-lists-.patch
|
||||
Patch6: rebar-0006-No-such-function-lists-keyfind-3-in-R12B5-use-lists-.patch
|
||||
# R12B - EPEL5-specific
|
||||
Patch6: rebar-0006-No-such-type-dict-in-R12B.patch
|
||||
Patch7: rebar-0007-No-such-type-dict-in-R12B.patch
|
||||
# R12B - EPEL5-specific
|
||||
Patch7: rebar-0007-No-such-directive-opaque-in-R12B.patch
|
||||
Patch8: rebar-0008-No-such-directive-opaque-in-R12B.patch
|
||||
# R12B - EPEL5-specific
|
||||
Patch8: rebar-0008-No-such-type-boolean-in-R12B.patch
|
||||
Patch9: rebar-0009-No-such-type-boolean-in-R12B.patch
|
||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||
BuildRequires: erlang-erts
|
||||
BuildRequires: erlang-getopt
|
||||
|
@ -41,6 +42,7 @@ BuildRequires: erlang-reltool
|
|||
Requires: erlang-asn1
|
||||
Requires: erlang-compiler
|
||||
Requires: erlang-crypto
|
||||
# FIXME does it still needed?
|
||||
Requires: erlang-dialyzer
|
||||
Requires: erlang-edoc
|
||||
%if 0%{?el6}%{?fedora}
|
||||
|
@ -48,6 +50,7 @@ Requires: erlang-edoc
|
|||
Requires: erlang-erlydtl
|
||||
%endif
|
||||
Requires: erlang-erts
|
||||
# Requires for port compiling - no direct references in Rebar's src/*.erl files
|
||||
Requires: erlang-erl_interface
|
||||
Requires: erlang-eunit
|
||||
Requires: erlang-getopt
|
||||
|
@ -60,6 +63,7 @@ Requires: erlang-protobuffs
|
|||
# No reltool at all in R12B
|
||||
Requires: erlang-reltool
|
||||
%endif
|
||||
Requires: erlang-sasl
|
||||
Requires: erlang-snmp
|
||||
Requires: erlang-stdlib
|
||||
Requires: erlang-syntax_tools
|
||||
|
@ -76,12 +80,13 @@ Erlang Build Tools.
|
|||
%patch1 -p1 -b .no_bundle
|
||||
%patch2 -p1 -b .remove_bundled_mustache
|
||||
%patch3 -p1 -b .remove_bundled_getopt
|
||||
%patch4 -p1 -b .allow_discarding_ports
|
||||
%if 0%{?el5}
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%endif
|
||||
# FIXME enable back when erlang-abnfc will be available
|
||||
rm -f src/rebar_abnfc_compiler.erl
|
||||
|
@ -126,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue Jun 05 2012 Peter Lemenkov <lemenkov@gmail.com> - 2.0.0-1
|
||||
- Ver. 2.0.0
|
||||
|
||||
* Tue May 22 2012 Peter Lemenkov <lemenkov@gmail.com> - 2-9.20120514git635d1a9
|
||||
- Fix building in EL6 and Fedora
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
From 6d7b6dca598f26fa5b46561b851e6b8286a50662 Mon Sep 17 00:00:00 2001
|
||||
From 10825391358904e93f2c14f5005734de114e6c04 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Lemenkov <lemenkov@gmail.com>
|
||||
Date: Tue, 28 Sep 2010 23:04:36 +0400
|
||||
Subject: [PATCH 1/8] No need to create bundle
|
||||
Subject: [PATCH 1/9] No need to create bundle
|
||||
|
||||
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
||||
---
|
||||
|
@ -9,10 +9,10 @@ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
|||
1 file changed, 40 deletions(-)
|
||||
|
||||
diff --git a/bootstrap b/bootstrap
|
||||
index e86ad8e..c4992a7 100755
|
||||
index c8a40de..be0523a 100755
|
||||
--- a/bootstrap
|
||||
+++ b/bootstrap
|
||||
@@ -52,46 +52,6 @@ main(Args) ->
|
||||
@@ -56,46 +56,6 @@ main(Args) ->
|
||||
%% Run rebar to do proper .app validation and such
|
||||
rebar:main(["compile"] ++ Args),
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
From 844182030976e868e7cd6aa67e891d55db749a65 Mon Sep 17 00:00:00 2001
|
||||
From 5cb49f4fe2b076410f47d16a8ad10cf3ad3841a6 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Lemenkov <lemenkov@gmail.com>
|
||||
Date: Sat, 20 Nov 2010 16:36:45 +0300
|
||||
Subject: [PATCH 2/8] Remove bundled mustache
|
||||
Subject: [PATCH 2/9] Remove bundled mustache
|
||||
|
||||
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
||||
---
|
||||
|
@ -11,7 +11,7 @@ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
|||
delete mode 100644 src/mustache.erl
|
||||
|
||||
diff --git a/ebin/rebar.app b/ebin/rebar.app
|
||||
index 0c6e4c3..0836c7c 100644
|
||||
index 5689b35..cb4ab64 100644
|
||||
--- a/ebin/rebar.app
|
||||
+++ b/ebin/rebar.app
|
||||
@@ -35,8 +35,7 @@
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
From 0915eb1978ebca6d0f89421203d5be6d6b4fdd86 Mon Sep 17 00:00:00 2001
|
||||
From f5046488c69513ae33ccf00b2696b5daa169c7ba Mon Sep 17 00:00:00 2001
|
||||
From: Peter Lemenkov <lemenkov@gmail.com>
|
||||
Date: Sat, 20 Nov 2010 16:40:15 +0300
|
||||
Subject: [PATCH 3/8] Remove bundled getopt
|
||||
Subject: [PATCH 3/9] Remove bundled getopt
|
||||
|
||||
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
||||
---
|
||||
|
@ -11,7 +11,7 @@ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
|||
delete mode 100644 src/getopt.erl
|
||||
|
||||
diff --git a/ebin/rebar.app b/ebin/rebar.app
|
||||
index 0836c7c..a9dc46d 100644
|
||||
index cb4ab64..cf69b8a 100644
|
||||
--- a/ebin/rebar.app
|
||||
+++ b/ebin/rebar.app
|
||||
@@ -34,8 +34,7 @@
|
||||
|
|
|
@ -0,0 +1,27 @@
|
|||
From e62f4e26cdfa3da248d629336320fbf5846d0b41 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Lemenkov <lemenkov@gmail.com>
|
||||
Date: Tue, 5 Jun 2012 15:10:12 +0400
|
||||
Subject: [PATCH 4/9] Allow discarding building ports
|
||||
|
||||
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
||||
---
|
||||
src/rebar_port_compiler.erl | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/src/rebar_port_compiler.erl b/src/rebar_port_compiler.erl
|
||||
index cdd9be6..e56089b 100644
|
||||
--- a/src/rebar_port_compiler.erl
|
||||
+++ b/src/rebar_port_compiler.erl
|
||||
@@ -110,6 +110,9 @@ compile(Config, AppFile) ->
|
||||
ok; % old specs empty
|
||||
{new, [], []} ->
|
||||
ok; % port_specs empty
|
||||
+ {_, _, [{_,_,_,[],[],_}]} ->
|
||||
+ % Special case to discard port processing at all
|
||||
+ ok; % port_specs empty
|
||||
|
||||
_ -> % have old/new specs
|
||||
|
||||
--
|
||||
1.7.10.2
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From e5fcb003c75c57ace23e1dcc873511ef550a0cab Mon Sep 17 00:00:00 2001
|
||||
From ae89d297d5dc0ec0f662a1947a1cd306c1379ca7 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Lemenkov <lemenkov@gmail.com>
|
||||
Date: Tue, 22 May 2012 14:03:31 +0400
|
||||
Subject: [PATCH 4/8] No erlang:min/2 and erlang:max/2 in R12B
|
||||
Subject: [PATCH 5/9] No erlang:min/2 and erlang:max/2 in R12B
|
||||
|
||||
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
||||
---
|
|
@ -1,7 +1,7 @@
|
|||
From e0c8d80a666c83f304b22f8a8cb0838ea645744a Mon Sep 17 00:00:00 2001
|
||||
From d460e43353fb4d2a005bfd4a4bbd0e6b81e4edc7 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Lemenkov <lemenkov@gmail.com>
|
||||
Date: Tue, 22 May 2012 14:11:11 +0400
|
||||
Subject: [PATCH 5/8] No such function lists:keyfind/3 in R12B5 - use
|
||||
Subject: [PATCH 6/9] No such function lists:keyfind/3 in R12B5 - use
|
||||
lists:keysearch/3 instead
|
||||
|
||||
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
||||
|
@ -66,7 +66,7 @@ index e502743..21ff2dc 100644
|
|||
lists:keyreplace(sys, 1, ReltoolConfig, ExpandedSys);
|
||||
_ ->
|
||||
diff --git a/src/rebar_reltool.erl b/src/rebar_reltool.erl
|
||||
index 42c7f15..5ff4044 100644
|
||||
index c114811..eb34385 100644
|
||||
--- a/src/rebar_reltool.erl
|
||||
+++ b/src/rebar_reltool.erl
|
||||
@@ -116,8 +116,8 @@ process_overlay(ReltoolConfig) ->
|
|
@ -1,7 +1,7 @@
|
|||
From 1f4d9503c3ed5c81a1a3182e36cfa48fed71e13d Mon Sep 17 00:00:00 2001
|
||||
From ea5fea7e174db92e1946f028d6ced85c43007894 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Lemenkov <lemenkov@gmail.com>
|
||||
Date: Tue, 22 May 2012 14:44:44 +0400
|
||||
Subject: [PATCH 6/8] No such type dict() in R12B
|
||||
Subject: [PATCH 7/9] No such type dict() in R12B
|
||||
|
||||
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
||||
---
|
|
@ -1,7 +1,7 @@
|
|||
From 4354f14dd2d0a4478ce1e3015eafe23d41ef9963 Mon Sep 17 00:00:00 2001
|
||||
From 79c8084664cbcd2bb6693f2f7ef4474b1b83e660 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Lemenkov <lemenkov@gmail.com>
|
||||
Date: Tue, 22 May 2012 14:55:39 +0400
|
||||
Subject: [PATCH 7/8] No such directive -opaque in R12B
|
||||
Subject: [PATCH 8/9] No such directive -opaque in R12B
|
||||
|
||||
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
||||
---
|
|
@ -1,7 +1,7 @@
|
|||
From 8a138f286a7b85e6a7d3f006bbdc0f521486d546 Mon Sep 17 00:00:00 2001
|
||||
From e07c9bfd44caa831cf177f726642fe961a153269 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Lemenkov <lemenkov@gmail.com>
|
||||
Date: Tue, 22 May 2012 15:06:36 +0400
|
||||
Subject: [PATCH 8/8] No such type boolean in R12B
|
||||
Subject: [PATCH 9/9] No such type boolean in R12B
|
||||
|
||||
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
||||
---
|
Loading…
Reference in New Issue