[erlang-folsom] Fix for Erlang R14B (EPEL6)

[Peter Lemenkov]

commit 240d4032c0a45d309b4bdbbd3b0a6a9ba05324fd
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Wed Jan 9 12:48:07 2013 +0400

    Fix for Erlang R14B (EPEL6)
    
    Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

 erlang-folsom-0001-Don-t-check-for-deps.patch      |    4 +-
 erlang-folsom-0002-Fix-for-PowerPC.patch           |    4 +-
 erlang-folsom-0003-Fix-version-string.patch        |    4 +-
 erlang-folsom-0004-Fix-for-Erlang-R14B-EPEL6.patch |   26 ++++++++++++++++++++
 erlang-folsom.spec                                 |   11 ++++++--
 5 files changed, 40 insertions(+), 9 deletions(-)
---
diff --git a/erlang-folsom-0001-Don-t-check-for-deps.patch b/erlang-folsom-0001-Don-t-check-for-deps.patch
index 6a4e186..ea9fb08 100644
--- a/erlang-folsom-0001-Don-t-check-for-deps.patch
+++ b/erlang-folsom-0001-Don-t-check-for-deps.patch
@@ -1,7 +1,7 @@
 From 1306776aab482d2eacb8af2d8881fce2cbf93002 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Mon, 8 Oct 2012 20:55:44 +0400
-Subject: [PATCH 1/3] Don't check for deps
+Subject: [PATCH 1/4] Don't check for deps
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---
@@ -23,5 +23,5 @@ index 0f72aae..048b5a1 100644
  {erl_opts, [debug_info]}.
  {cover_enabled, true}.
 -- 
-1.8.0.1
+1.8.0.2
 
diff --git a/erlang-folsom-0002-Fix-for-PowerPC.patch b/erlang-folsom-0002-Fix-for-PowerPC.patch
index f7011bc..fea233c 100644
--- a/erlang-folsom-0002-Fix-for-PowerPC.patch
+++ b/erlang-folsom-0002-Fix-for-PowerPC.patch
@@ -1,7 +1,7 @@
 From cdb9a85eadba9f35dad3b8a6d9b7df5c723885b2 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Mon, 8 Oct 2012 23:23:31 +0400
-Subject: [PATCH 2/3] Fix for PowerPC
+Subject: [PATCH 2/4] Fix for PowerPC
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---
@@ -22,5 +22,5 @@ index c35d27a..fd4242c 100644
      List1 = proplists:get_value(percentile, List),
      percentile_check(List1),
 -- 
-1.8.0.1
+1.8.0.2
 
diff --git a/erlang-folsom-0003-Fix-version-string.patch b/erlang-folsom-0003-Fix-version-string.patch
index 3d89c4a..588a002 100644
--- a/erlang-folsom-0003-Fix-version-string.patch
+++ b/erlang-folsom-0003-Fix-version-string.patch
@@ -1,7 +1,7 @@
 From 2851bba01b15293038702ce6d4ff42df4fa74564 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Mon, 8 Oct 2012 23:34:57 +0400
-Subject: [PATCH 3/3] Fix version string
+Subject: [PATCH 3/4] Fix version string
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---
@@ -22,5 +22,5 @@ index 3380bed..76ba6a8 100644
                  folsom_metrics_histogram_ets,
                  folsom_sup]},
 -- 
-1.8.0.1
+1.8.0.2
 
diff --git a/erlang-folsom-0004-Fix-for-Erlang-R14B-EPEL6.patch b/erlang-folsom-0004-Fix-for-Erlang-R14B-EPEL6.patch
new file mode 100644
index 0000000..9471305
--- /dev/null
+++ b/erlang-folsom-0004-Fix-for-Erlang-R14B-EPEL6.patch
@@ -0,0 +1,26 @@
+From 19e4f335ef674e2ea7be47fb183999c81ba331dc Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Wed, 9 Jan 2013 12:44:06 +0400
+Subject: [PATCH 4/4] Fix for Erlang R14B (EPEL6)
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ src/folsom_metrics.erl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/folsom_metrics.erl b/src/folsom_metrics.erl
+index db0936f..a201fa6 100644
+--- a/src/folsom_metrics.erl
++++ b/src/folsom_metrics.erl
+@@ -150,7 +150,7 @@ get_history_values(Name, Count) ->
+     folsom_ets:get_history_values(Name, Count).
+ 
+ histogram_timed_update(Name, Fun) ->
+-    {Time, Value} = timer:tc(Fun),
++    {Time, Value} = timer:tc(Fun, []),
+     ok = notify({Name, Time}),
+     Value.
+ 
+-- 
+1.8.0.2
+
diff --git a/erlang-folsom.spec b/erlang-folsom.spec
index c71131f..954130c 100644
--- a/erlang-folsom.spec
+++ b/erlang-folsom.spec
@@ -4,7 +4,7 @@
 
 Name:		erlang-%{realname}
 Version:	0.7.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Erlang-based metrics system
 Group:		Development/Languages
 License:	ASL 2.0
@@ -17,15 +17,16 @@ Patch1:		erlang-folsom-0001-Don-t-check-for-deps.patch
 Patch2:		erlang-folsom-0002-Fix-for-PowerPC.patch
 # Fedora/EPEL-specific
 Patch3:		erlang-folsom-0003-Fix-version-string.patch
+# Fedora/EPEL-specific
+Patch4:		erlang-folsom-0004-Fix-for-Erlang-R14B-EPEL6.patch
 BuildRequires:	erlang-bear
 BuildRequires:	erlang-meck
 BuildRequires:	erlang-rebar
 Requires:	erlang-bear%{?_isa}
 Requires:	erlang-erts%{?_isa}
 Requires:	erlang-kernel%{?_isa}
-# Error:erlang(timer:tc/1) in R14B and below
 # Error:erlang(timer:tc/2) in R13B and below
-Requires:	erlang-stdlib%{?_isa} >= R15B
+Requires:	erlang-stdlib%{?_isa} >= R14B
 
 
 %description
@@ -44,6 +45,7 @@ and updated via the folsom_metrics module.
 %patch2 -p1 -b .ppc
 %endif
 %patch3 -p1 -b .version
+%patch4 -p1 -b .r14b
 
 
 %build
@@ -73,6 +75,9 @@ rebar eunit -v
 
 
 %changelog
+* Wed Jan 09 2013 Peter Lemenkov <lemenkov at gmail.com> - 0.7.3-2
+- Fix for Erlang R14B (EPEL6)
+
 * Fri Dec 21 2012 Peter Lemenkov <lemenkov at gmail.com> - 0.7.3-1
 - Ver. 0.7.3