Disable gbp properly (have to bootstrap)

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>

erlang-rebar.spec

@@ -5,14 +5,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.6.1
-Release:	5%{?dist}
+Release:	5.1%{?dist}
 Summary:	Erlang Build Tools
 Group:		Development/Tools
 License:	MIT
@@ -76,9 +76,9 @@ Erlang Build Tools.
 %setup -q -n %{realname}-%{version}
 %patch1 -p1 -b .dont_load_templates
 %patch2 -p1 -b .remove_bundled_mustache
-%if 0%{?need_bootstrap} < 1
+#%if 0%{?need_bootstrap} < 1
 %patch3 -p1 -b .remove_bundled_getopt
-%endif
+#%endif
 %patch4 -p1 -b .allow_discarding_ports
 %patch5 -p1 -b .use_locally_installed
 %patch6 -p1 -b .remove_escript_foldl_3
@@ -120,6 +120,9 @@ cp -a priv %{buildroot}%{_erllibdir}/%{realname}-%{version}/
 
 
 %changelog
+* Wed Mar  2 2016 Peter Lemenkov <lemenkov@gmail.com> - 2.6.1-5.1
+- Disable gbp properly (have to bootstrap)
+
 * Wed Mar  2 2016 Peter Lemenkov <lemenkov@gmail.com> - 2.6.1-5
 - Fix dependency issues mentioned by automatic dependency checker
 

rebar-0009-Remove-support-for-gpb-compiler.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Remove support for gpb compiler
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 
 diff --git a/ebin/rebar.app b/ebin/rebar.app
-index 9f5ae44..43189b7 100644
+index 9f5ae44..81aaafc 100644
 --- a/ebin/rebar.app
 +++ b/ebin/rebar.app
 @@ -31,7 +31,6 @@
@@ -16,6 +16,14 @@ index 9f5ae44..43189b7 100644
                rebar_qc,
                rebar_rel_utils,
                rebar_reltool,
+@@ -82,7 +81,6 @@
+                     {app_dir, [
+                                rebar_proto_compiler,
+                                rebar_protobuffs_compiler,
+-                               rebar_proto_gpb_compiler,
+                                rebar_neotoma_compiler,
+                                rebar_asn1_compiler,
+                                rebar_dia_compiler,
 diff --git a/src/rebar_proto_gpb_compiler.erl b/src/rebar_proto_gpb_compiler.erl
 deleted file mode 100644
 index c528a4a..0000000