[erlang-rebar] Fix building in EL6 and Fedora

Peter Lemenkov peter at fedoraproject.org
Tue May 22 12:05:34 UTC 2012


commit 1cc7cddf1367df502194e79f76a98ca143253a1a
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Tue May 22 16:05:20 2012 +0400

    Fix building in EL6 and Fedora
    
    Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

 erlang-rebar.spec |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/erlang-rebar.spec b/erlang-rebar.spec
index 79c208d..28bd0e3 100644
--- a/erlang-rebar.spec
+++ b/erlang-rebar.spec
@@ -7,7 +7,7 @@
 
 Name:		erlang-%{realname}
 Version:	2
-Release:	8.20120514git%{git_tag}%{?dist}
+Release:	9.20120514git%{git_tag}%{?dist}
 Summary:	Erlang Build Tools
 Group:		Development/Tools
 License:	MIT
@@ -31,9 +31,9 @@ Patch8:		rebar-0008-No-such-type-boolean-in-R12B.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	erlang-erts
 BuildRequires:	erlang-getopt
-%if 0%{!?el5}
-# Missing dependency - FIXME this is a bug in erlang in EPEL5
 BuildRequires:	erlang-erl_interface
+%if 0%{?el6}%{?fedora}
+# No reltool at all in R12B
 BuildRequires:	erlang-reltool
 %endif
 # wip
@@ -43,14 +43,12 @@ Requires:	erlang-compiler
 Requires:	erlang-crypto
 Requires:	erlang-dialyzer
 Requires:	erlang-edoc
-%if 0%{!?el5}
+%if 0%{?el6}%{?fedora}
+# No erlydtl in EPEL5 so far
 Requires:	erlang-erlydtl
 %endif
 Requires:	erlang-erts
-%if 0%{!?el5}
-# Missing dependency - FIXME this is a bug in erlang in EPEL5
 Requires:	erlang-erl_interface
-%endif
 Requires:	erlang-eunit
 Requires:	erlang-getopt
 Requires:	erlang-kernel
@@ -58,8 +56,8 @@ Requires:	erlang-lfe
 Requires:	erlang-mustache
 Requires:	erlang-neotoma
 Requires:	erlang-protobuffs
-%if 0%{!?el5}
-# No reltool at all in the R12B
+%if 0%{?el6}%{?fedora}
+# No reltool at all in R12B
 Requires:	erlang-reltool
 %endif
 Requires:	erlang-snmp
@@ -92,7 +90,7 @@ sed -i -e "/rebar_abnfc_compiler/d" ebin/rebar.app
 # Remove erlydtl support
 rm -f src/rebar_erlydtl_compiler.erl
 sed -i -e "/rebar_erlydtl_compiler/d" ebin/rebar.app
-# Remove reltool support
+# Remove reltool support - no reltool at all in the R12B
 rm -f src/rebar_reltool.erl
 sed -i -e "/rebar_reltool/d" ebin/rebar.app
 # Remove templater support - not required just for building anyway
@@ -128,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue May 22 2012 Peter Lemenkov <lemenkov at gmail.com> - 2-9.20120514git635d1a9
+- Fix building in EL6 and Fedora
+
 * Mon May 21 2012 Peter Lemenkov <lemenkov at gmail.com> - 2-8.20120514git635d1a9
 - Explicitly list erlang-erl_interface as a dependency
 - Fixed EPEL5 dependencies


More information about the scm-commits mailing list