[erlang-folsom] Ver. 0.7.4

Peter Lemenkov peter at fedoraproject.org
Sun Mar 3 08:49:05 UTC 2013


commit fec4278e0ef856e3fbdd37473ba58c31e25b5a91
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sun Mar 3 12:48:52 2013 +0400

    Ver. 0.7.4
    
    Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

 .gitignore                                         |    1 +
 erlang-folsom-0001-Don-t-check-for-deps.patch      |   27 ----------------
 ...tch => erlang-folsom-0001-Fix-for-PowerPC.patch |   10 +++---
 ... => erlang-folsom-0002-Fix-version-string.patch |   10 +++---
 ...ang-folsom-0003-Fix-for-Erlang-R14B-EPEL6.patch |   10 +++---
 erlang-folsom.spec                                 |   33 +++++++++++---------
 sources                                            |    2 +-
 7 files changed, 35 insertions(+), 58 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eb36fbb..cbce2d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /boundary-folsom-0.7.1-0-gc0019b3.tar.gz
 /folsom-0.7.3.tar.gz
+/boundary-folsom-0.7.4-0-g154024e.tar.gz
diff --git a/erlang-folsom-0002-Fix-for-PowerPC.patch b/erlang-folsom-0001-Fix-for-PowerPC.patch
similarity index 81%
rename from erlang-folsom-0002-Fix-for-PowerPC.patch
rename to erlang-folsom-0001-Fix-for-PowerPC.patch
index fea233c..78b5367 100644
--- a/erlang-folsom-0002-Fix-for-PowerPC.patch
+++ b/erlang-folsom-0001-Fix-for-PowerPC.patch
@@ -1,7 +1,7 @@
-From cdb9a85eadba9f35dad3b8a6d9b7df5c723885b2 Mon Sep 17 00:00:00 2001
+From 279c490074e8c4d144dc35a3b6c32bdc957c2bf7 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/4] Fix for PowerPC
+Subject: [PATCH 1/3] Fix for PowerPC
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---
@@ -9,10 +9,10 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/test/folsom_erlang_checks.erl b/test/folsom_erlang_checks.erl
-index c35d27a..fd4242c 100644
+index eeeffd7..61b4249 100644
 --- a/test/folsom_erlang_checks.erl
 +++ b/test/folsom_erlang_checks.erl
-@@ -303,7 +303,7 @@ histogram_checks(List) ->
+@@ -374,7 +374,7 @@ histogram_checks(List) ->
      200 = proplists:get_value(median, List),
      2254368.454545454 = proplists:get_value(variance, List),
      1501.4554454080394 = proplists:get_value(standard_deviation, List),
@@ -22,5 +22,5 @@ index c35d27a..fd4242c 100644
      List1 = proplists:get_value(percentile, List),
      percentile_check(List1),
 -- 
-1.8.0.2
+1.8.1.4
 
diff --git a/erlang-folsom-0003-Fix-version-string.patch b/erlang-folsom-0002-Fix-version-string.patch
similarity index 76%
rename from erlang-folsom-0003-Fix-version-string.patch
rename to erlang-folsom-0002-Fix-version-string.patch
index 588a002..b0ae151 100644
--- a/erlang-folsom-0003-Fix-version-string.patch
+++ b/erlang-folsom-0002-Fix-version-string.patch
@@ -1,7 +1,7 @@
-From 2851bba01b15293038702ce6d4ff42df4fa74564 Mon Sep 17 00:00:00 2001
+From 76babf69257309d11722a4d5e229cac22c93d866 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/4] Fix version string
+Subject: [PATCH 2/3] Fix version string
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---
@@ -9,7 +9,7 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/folsom.app.src b/src/folsom.app.src
-index 3380bed..76ba6a8 100644
+index 3380bed..0b52569 100644
 --- a/src/folsom.app.src
 +++ b/src/folsom.app.src
 @@ -2,7 +2,7 @@
@@ -17,10 +17,10 @@ index 3380bed..76ba6a8 100644
   [
    {description, ""},
 -  {vsn, git},
-+  {vsn, "0.7.3"},
++  {vsn, "0.7.4"},
    {registered, [folsom_meter_timer_server,
                  folsom_metrics_histogram_ets,
                  folsom_sup]},
 -- 
-1.8.0.2
+1.8.1.4
 
diff --git a/erlang-folsom-0004-Fix-for-Erlang-R14B-EPEL6.patch b/erlang-folsom-0003-Fix-for-Erlang-R14B-EPEL6.patch
similarity index 72%
rename from erlang-folsom-0004-Fix-for-Erlang-R14B-EPEL6.patch
rename to erlang-folsom-0003-Fix-for-Erlang-R14B-EPEL6.patch
index 9471305..6c36165 100644
--- a/erlang-folsom-0004-Fix-for-Erlang-R14B-EPEL6.patch
+++ b/erlang-folsom-0003-Fix-for-Erlang-R14B-EPEL6.patch
@@ -1,7 +1,7 @@
-From 19e4f335ef674e2ea7be47fb183999c81ba331dc Mon Sep 17 00:00:00 2001
+From 3efe8b8600965e7f47ebdfd3e6bf0b2847d9e97b 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)
+Subject: [PATCH 3/3] Fix for Erlang R14B (EPEL6)
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---
@@ -9,10 +9,10 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/folsom_metrics.erl b/src/folsom_metrics.erl
-index db0936f..a201fa6 100644
+index a6245c0..e953780 100644
 --- a/src/folsom_metrics.erl
 +++ b/src/folsom_metrics.erl
-@@ -150,7 +150,7 @@ get_history_values(Name, Count) ->
+@@ -180,7 +180,7 @@ get_history_values(Name, Count) ->
      folsom_ets:get_history_values(Name, Count).
  
  histogram_timed_update(Name, Fun) ->
@@ -22,5 +22,5 @@ index db0936f..a201fa6 100644
      Value.
  
 -- 
-1.8.0.2
+1.8.1.4
 
diff --git a/erlang-folsom.spec b/erlang-folsom.spec
index 2474a40..868d067 100644
--- a/erlang-folsom.spec
+++ b/erlang-folsom.spec
@@ -1,24 +1,25 @@
 %global realname folsom
+%global upstream boundary
 %global debug_package %{nil}
+%global git_tag 154024e
+%global patchnumber 0
 
 
 Name:		erlang-%{realname}
-Version:	0.7.3
-Release:	3%{?dist}
+Version:	0.7.4
+Release:	1%{?dist}
 Summary:	Erlang-based metrics system
 Group:		Development/Languages
 License:	ASL 2.0
 URL:		https://github.com/boundary/folsom
-# wget --content-disposition https://github.com/boundary/folsom/archive/0.7.3.tar.gz
-Source0:	%{realname}-%{version}.tar.gz
-# Fedora/EPEL-specific
-Patch1:		erlang-folsom-0001-Don-t-check-for-deps.patch
+# wget --content-disposition https://github.com/boundary/folsom/tarball/0.7.4
+Source0:	%{upstream}-%{realname}-%{version}-%{patchnumber}-g%{git_tag}.tar.gz
 # PowerPC-specific, backported from upstream
-Patch2:		erlang-folsom-0002-Fix-for-PowerPC.patch
+Patch1:		erlang-folsom-0001-Fix-for-PowerPC.patch
 # Fedora/EPEL-specific
-Patch3:		erlang-folsom-0003-Fix-version-string.patch
+Patch2:		erlang-folsom-0002-Fix-version-string.patch
 # Fedora/EPEL-specific
-Patch4:		erlang-folsom-0004-Fix-for-Erlang-R14B-EPEL6.patch
+Patch3:		erlang-folsom-0003-Fix-for-Erlang-R14B-EPEL6.patch
 BuildRequires:	erlang-bear
 BuildRequires:	erlang-meck
 BuildRequires:	erlang-rebar
@@ -39,13 +40,12 @@ and updated via the folsom_metrics module.
 
 
 %prep
-%setup -q -n %{realname}-%{version}
-%patch1 -p1 -b .nodeps
+%setup -q -n %{upstream}-%{realname}-%{git_tag}
 %ifarch ppc %{power64}
-%patch2 -p1 -b .ppc
+%patch1 -p1 -b .ppc
 %endif
-%patch3 -p1 -b .version
-%patch4 -p1 -b .r14b
+%patch2 -p1 -b .version
+%patch3 -p1 -b .r14b
 
 
 %build
@@ -60,7 +60,7 @@ install -D -m 644 include/%{realname}.hrl $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%
 
 
 %check
-rebar eunit -v
+rebar eunit skip_deps=true -v
 
 
 %files
@@ -75,6 +75,9 @@ rebar eunit -v
 
 
 %changelog
+* Sun Mar 03 2013 Peter Lemenkov <lemenkov at gmail.com> - 0.7.4-1
+- Ver. 0.7.4
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index e51c584..dcd12ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aa27318e18ca2ab4381a4b63f23c7320  folsom-0.7.3.tar.gz
+3c6ec757aa02e4fb69c760ffc48ba59d  boundary-folsom-0.7.4-0-g154024e.tar.gz


More information about the scm-commits mailing list