backported fix for ErlyDTL templates compilation

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

erlang-rebar.spec

@@ -7,7 +7,7 @@
 
 Name:		erlang-%{realname}
 Version:	2.1.0
-Release:	0.3%{?dist}
+Release:	0.4%{?dist}
 Summary:	Erlang Build Tools
 Group:		Development/Tools
 License:	MIT
@@ -33,6 +33,8 @@ Patch7:		rebar-0007-Remove-any-traces-of-long-time-obsolete-escript-fold.patch
 Patch8:		rebar-0008-Remove-abnfc-compiler-support-n-a-in-Fedora-EPEL.patch
 # Fedora/EPEL-specific - cosmetic
 Patch9:		rebar-0009-Adjust-app-version.patch
+# Backported from upstream
+Patch10:	rebar-0010-Fix-default-DTL-compilation-when-no-erlydtl_opts-are.patch
 BuildRequires:	erlang-rebar
 # FIXME wip
 #Requires:	erlang-abnfc%{?_isa}
@@ -79,6 +81,7 @@ Erlang Build Tools.
 %patch7 -p1 -b .remove_escript_foldl_3
 %patch8 -p1 -b .no_abnfc
 %patch9 -p1 -b .adjust_ver
+%patch10 -p1 -b .fix_dtl
 
 
 %build
@@ -106,6 +109,9 @@ cp -a priv %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/
 
 
 %changelog
+* Tue Mar 12 2013 Peter Lemenkov <lemenkov@gmail.com> - 2.1.0-0.4
+- backported fix for ErlyDTL templates compilation
+
 * Wed Mar 06 2013 Peter Lemenkov <lemenkov@gmail.com> - 2.1.0-0.3
 - Don't bootstrap anymore - use rebar for building rebar
 

rebar-0001-Don-t-load-templates-from-the-bundle.patch

@@ -1,7 +1,7 @@
 From b658042106136a5b471f0d248ec988c6eed77006 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov@gmail.com>
 Date: Mon, 4 Mar 2013 19:03:03 +0400
-Subject: [PATCH 1/9] Don't load templates from the bundle
+Subject: [PATCH 01/10] Don't load templates from the bundle
 
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 ---

rebar-0002-Remove-bundled-mustache.patch

@@ -1,7 +1,7 @@
 From fce5d859e5a24dcbff1796293a4835078b758080 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/9] Remove bundled mustache
+Subject: [PATCH 02/10] Remove bundled mustache
 
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 ---

rebar-0003-Remove-bundled-getopt.patch

@@ -1,7 +1,7 @@
 From e200556bfca9db7e496a50b62fa09a5f46f22b25 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/9] Remove bundled getopt
+Subject: [PATCH 03/10] Remove bundled getopt
 
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 ---

rebar-0004-Be-sure-to-filter-empty-sources-h-t-to-Tuncer-and-Jo.patch

@@ -1,7 +1,7 @@
 From 53508faa9cba923751653901ba21d6025da46e5b Mon Sep 17 00:00:00 2001
 From: Dave Smith <dizzyd@dizzyd.com>
 Date: Mon, 12 Nov 2012 20:18:00 -0700
-Subject: [PATCH 4/9] Be sure to filter empty sources (h/t to Tuncer and Joe
+Subject: [PATCH 04/10] Be sure to filter empty sources (h/t to Tuncer and Joe
  Norton)
 
 ---

rebar-0005-Allow-discarding-building-ports.patch

@@ -1,7 +1,7 @@
 From a101ee059baff585da6d1086097e8ceb20bda5d1 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov@gmail.com>
 Date: Tue, 5 Jun 2012 15:10:12 +0400
-Subject: [PATCH 5/9] Allow discarding building ports
+Subject: [PATCH 05/10] Allow discarding building ports
 
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 

rebar-0006-Check-system-wide-libdir-in-case-of-source-based-dep.patch

@@ -1,7 +1,7 @@
 From 13fd63738960c567d32df3061a2a4e5452dac0e1 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov@gmail.com>
 Date: Sat, 2 Mar 2013 10:39:15 +0400
-Subject: [PATCH 6/9] Check system-wide libdir in case of source-based
+Subject: [PATCH 06/10] Check system-wide libdir in case of source-based
  dependency
 
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>

rebar-0007-Remove-any-traces-of-long-time-obsolete-escript-fold.patch

@@ -1,7 +1,7 @@
 From 1900df4838d7623009b09fffaa6f23daa5da46c8 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov@gmail.com>
 Date: Sat, 2 Mar 2013 13:35:36 +0400
-Subject: [PATCH 7/9] Remove any traces of long-time obsolete escript:foldl/3
+Subject: [PATCH 07/10] Remove any traces of long-time obsolete escript:foldl/3
 
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 ---

rebar-0008-Remove-abnfc-compiler-support-n-a-in-Fedora-EPEL.patch

@@ -1,7 +1,7 @@
 From ec4f8e74c6058e6ba61e9687cccf30ed9378dca2 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov@gmail.com>
 Date: Sat, 2 Mar 2013 13:52:04 +0400
-Subject: [PATCH 8/9] Remove abnfc compiler support (n/a in Fedora/EPEL)
+Subject: [PATCH 08/10] Remove abnfc compiler support (n/a in Fedora/EPEL)
 
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 ---

rebar-0009-Adjust-app-version.patch

@@ -1,7 +1,7 @@
 From 15f315f3b3ec0d4e11186b9eabb9789b4c38b1b0 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov@gmail.com>
 Date: Sat, 2 Mar 2013 13:52:35 +0400
-Subject: [PATCH 9/9] Adjust app version
+Subject: [PATCH 09/10] Adjust app version
 
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 ---

rebar-0010-Fix-default-DTL-compilation-when-no-erlydtl_opts-are.patch

@@ -0,0 +1,26 @@
+From 4139a739f3cfafdb46e511f09b58644cd8c9addb Mon Sep 17 00:00:00 2001
+From: serge <saleyn@gmail.com>
+Date: Thu, 15 Nov 2012 16:34:06 -0500
+Subject: [PATCH 10/10] Fix default DTL compilation when no erlydtl_opts are
+ provided
+
+---
+ src/rebar_erlydtl_compiler.erl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/rebar_erlydtl_compiler.erl b/src/rebar_erlydtl_compiler.erl
+index b5fe899..aef41c5 100644
+--- a/src/rebar_erlydtl_compiler.erl
++++ b/src/rebar_erlydtl_compiler.erl
+@@ -133,7 +133,7 @@ erlydtl_opts(Config) ->
+     Tuples = [{K,V} || {K,V} <- Opts],
+     case [L || L <- Opts, is_list(L), not io_lib:printable_list(L)] of
+         [] ->
+-            lists:keysort(1, Tuples);
++            [lists:keysort(1, Tuples)];
+         Lists ->
+             lists:map(fun(L) ->
+                 lists:keysort(1, lists:foldl(fun({K,T}, Acc) ->
+-- 
+1.8.1.4
+