Add more bootstrap conditionals for bundled libs

* master:
  Bump the release for the bootstrap mode change
  Add bootstrap mode and add necessary conditionals for building rebar with a self-hosted rebar

erlang-rebar.spec

@@ -7,14 +7,14 @@
 # Set this to true when starting a rebuild of the whole erlang stack. There's
 # a cyclical dependency between erlang-rebar and erlang-getopt so this package
 # (rebar) needs to get built first in bootstrap mode.
-%global need_bootstrap_set 0
+%global need_bootstrap_set 1
 
 %{!?need_bootstrap: %global need_bootstrap  %{need_bootstrap_set}}
 
 
 Name:		erlang-%{realname}
 Version:	2.1.0
-Release:	0.7%{?dist}
+Release:	0.2%{?dist}
 Summary:	Erlang Build Tools
 Group:		Development/Tools
 License:	MIT
@@ -22,14 +22,15 @@ URL:		https://github.com/rebar/rebar
 # wget --content-disposition https://github.com/basho/rebar/tarball/ebb474b
 Source0:	%{upstream}-%{realname}-%{version}-pre-%{patchnumber}-g%{git_tag}.tar.gz
 Source1:	rebar.escript
+
+# The bundled getopt is necessary to do the initial bootstrap since
+# erlang-getopt requires erlang-rebar to build and vice versa.
+%if 0%{?need_bootstrap} < 1
 # Fedora/EPEL-specific
 Patch1:		rebar-0001-Don-t-load-templates-from-the-bundle.patch
 # Fedora/EPEL-specific
 Patch2:		rebar-0002-Remove-bundled-mustache.patch
 
-# The bundled getopt is necessary to do the initial bootstrap since
-# erlang-getopt requires erlang-rebar to build and vice versa.
-%if 0%{?need_bootstrap} < 1
 # Fedora/EPEL-specific
 Patch3:		rebar-0003-Remove-bundled-getopt.patch
 %endif
@@ -63,7 +64,9 @@ Requires:	erlang-crypto%{?_isa}
 # FIXME does it still needed?
 Requires:	erlang-dialyzer%{?_isa}
 Requires:	erlang-edoc%{?_isa}
+%if 1%{?need_bootstrap} < 1
 Requires:	erlang-erlydtl%{?_isa}
+%endif
 Requires:	erlang-erts%{?_isa}
 # Requires for port compiling - no direct references in Rebar's src/*.erl files
 Requires:	erlang-erl_interface%{?_isa}
@@ -71,13 +74,21 @@ Requires:	erlang-erl_interface%{?_isa}
 # eunit_test:function_wrapper/2.  This function was removed in R16, and rebar
 # contains a workaround for that. So no need to worry about that.
 Requires:	erlang-eunit%{?_isa}
+%if 1%{?need_bootstrap} < 1
 Requires:	erlang-getopt%{?_isa}
+%endif
 Requires:	erlang-kernel%{?_isa}
+%if 1%{?need_bootstrap} < 1
 Requires:	erlang-lfe%{?_isa}
+%endif
+%if 1%{?need_bootstrap} < 1
 Requires:	erlang-mustache%{?_isa}
 Requires:	erlang-neotoma%{?_isa}
+%endif
 Requires:	erlang-parsetools%{?_isa}
+%if 1%{?need_bootstrap} < 1
 Requires:	erlang-protobuffs%{?_isa}
+%endif
 Requires:	erlang-reltool%{?_isa}
 Requires:	erlang-sasl%{?_isa}
 Requires:	erlang-snmp%{?_isa}
@@ -93,9 +104,9 @@ Erlang Build Tools.
 
 %prep
 %setup -q -n %{upstream}-%{realname}-%{git_tag}
+%if 0%{?need_bootstrap} < 1
 %patch1 -p1 -b .dont_load_templates
 %patch2 -p1 -b .remove_bundled_mustache
-%if 0%{?need_bootstrap} < 1
 %patch3 -p1 -b .remove_bundled_getopt
 %endif
 %patch4 -p1 -b .dont_try_building_so