Fix building in EL6 and Fedora

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
This commit is contained in:
Peter Lemenkov 2012-05-22 16:05:20 +04:00
parent dbaf4f9156
commit 1cc7cddf13
1 changed files with 11 additions and 10 deletions

View File

@ -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@gmail.com> - 2-9.20120514git635d1a9
- Fix building in EL6 and Fedora
* Mon May 21 2012 Peter Lemenkov <lemenkov@gmail.com> - 2-8.20120514git635d1a9
- Explicitly list erlang-erl_interface as a dependency
- Fixed EPEL5 dependencies