[erlang-gproc] Ver. 0.2.11 (fixes rhbz #824342)

Peter Lemenkov peter at fedoraproject.org
Sun May 27 14:04:08 UTC 2012


commit b51af5b88c845383462a411255cf24ef407fcd5d
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sun May 27 18:03:57 2012 +0400

    Ver. 0.2.11 (fixes rhbz #824342)
    
    Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

 .gitignore                                         |    1 +
 ...emove-explicit-rebar-deps-Fedora-specific.patch |   30 +++++++++++++++
 erlang-gproc-0002-Kill-useless-eunit-include.patch |   25 ++++++++++++
 erlang-gproc.spec                                  |   40 ++++++++++++--------
 sources                                            |    2 +-
 5 files changed, 81 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3f99ee1..8554ea4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /uwiger-gproc-f0807c9.tar.gz
+/esl-gproc-v0.2.11-0-g781e0d0.tar.gz
diff --git a/erlang-gproc-0001-Remove-explicit-rebar-deps-Fedora-specific.patch b/erlang-gproc-0001-Remove-explicit-rebar-deps-Fedora-specific.patch
new file mode 100644
index 0000000..1228563
--- /dev/null
+++ b/erlang-gproc-0001-Remove-explicit-rebar-deps-Fedora-specific.patch
@@ -0,0 +1,30 @@
+From c1b7451cb141d1d8e4345cfd20da820a591606a1 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Tue, 15 May 2012 17:31:31 +0400
+Subject: [PATCH 1/2] Remove explicit rebar deps (Fedora-specific)
+
+This is controlled by RPM in Fedora/EPEL.
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ rebar.config |    5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/rebar.config b/rebar.config
+index 2a7424d..5f1240d 100644
+--- a/rebar.config
++++ b/rebar.config
+@@ -1,10 +1,5 @@
+ %% -*- erlang -*-
+ {erl_opts, [debug_info]}.
+-{deps, [
+-        {edown, ".*", {git, "git://github.com/esl/edown.git", "HEAD"}},
+-        {gen_leader, ".*",
+-         {git, "git://github.com/abecciu/gen_leader_revival.git", "HEAD"}}
+-       ]}.
+ {dialyzer_opts, [{warnings, [no_unused,
+                              no_improper_lists, no_fun_app, no_match,
+                              no_opaque, no_fail_call,
+-- 
+1.7.10.2
+
diff --git a/erlang-gproc-0002-Kill-useless-eunit-include.patch b/erlang-gproc-0002-Kill-useless-eunit-include.patch
new file mode 100644
index 0000000..80f6475
--- /dev/null
+++ b/erlang-gproc-0002-Kill-useless-eunit-include.patch
@@ -0,0 +1,25 @@
+From e6653099cd1a63310e6077d9ebec3181ebfd238f Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Sat, 26 May 2012 20:08:38 +0400
+Subject: [PATCH 2/2] Kill useless eunit include
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ src/gproc.erl |    1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/gproc.erl b/src/gproc.erl
+index 0f5870c..54c6d36 100644
+--- a/src/gproc.erl
++++ b/src/gproc.erl
+@@ -131,7 +131,6 @@
+ 
+ 
+ -include("gproc.hrl").
+--include_lib("eunit/include/eunit.hrl").
+ 
+ -define(SERVER, ?MODULE).
+ %%-define(l, l(?LINE)). % when activated, calls a traceable empty function
+-- 
+1.7.10.2
+
diff --git a/erlang-gproc.spec b/erlang-gproc.spec
index cdfdaa2..a10cd27 100644
--- a/erlang-gproc.spec
+++ b/erlang-gproc.spec
@@ -1,26 +1,32 @@
 %global realname gproc
 %global debug_package %{nil}
-%global git_tag f0807c9
+%global upstream esl
+%global git_tag 781e0d0
+%global patchnumber 0
 
 
 Name:		erlang-%{realname}
-Version:	0
-Release:	0.5.20100929git%{git_tag}%{?dist}
+Version:	0.2.11
+Release:	1%{?dist}
 Summary:	Extended process registry for Erlang
 Group:		Development/Libraries
 License:	ERPL
 URL:		http://github.com/uwiger/gproc
-# wget --no-check-certificate http://github.com/uwiger/gproc/tarball/f0807c9
-Source0:	uwiger-%{realname}-%{git_tag}.tar.gz
+# wget --no-check-certificate --content-disposition https://github.com/esl/gproc/tarball/v0.2.11
+Source0:	%{upstream}-%{realname}-v%{version}-%{patchnumber}-g%{git_tag}.tar.gz
+Patch1:		erlang-gproc-0001-Remove-explicit-rebar-deps-Fedora-specific.patch
+Patch2:		erlang-gproc-0002-Kill-useless-eunit-include.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildRequires:	erlang-edown
 BuildRequires:	erlang-erts
 BuildRequires:	erlang-eunit
 BuildRequires:	erlang-gen_leader
 BuildRequires:	erlang-rebar
-Requires:	erlang-erts >= R12B-5
-Requires:	erlang-eunit >= R12B-5
+# Error:erlang(lists:keyfind/3) in R12B and below
+Requires:	erlang-erts >= R13B
 Requires:	erlang-gen_leader
 Requires:	erlang-kernel
+Requires:	erlang-mnesia
 Requires:	erlang-stdlib >= R12B-5
 
 
@@ -29,15 +35,14 @@ Extended process registry for Erlang.
 
 
 %prep
-%setup -q -n uwiger-%{realname}-%{git_tag}
-chmod 644 doc/*.pdf
-chmod 644 doc/*.doc
-sed -i -e "s,\./rebar,rebar,g" Makefile
-rm -rf src/Unit-Quick-Files
+%setup -q -n %{upstream}-%{realname}-d58b254
+%patch1 -p1 -b .nodeps
+%patch2 -p1 -b .no_eunit
 
 
 %build
-make %{?_smp_mflags} compile
+rebar compile -v
+rebar doc -v
 
 
 %install
@@ -46,8 +51,8 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/ebin
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/include
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/priv
 install -m 644 ebin/%{realname}.app $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/ebin
-install -m 644 ebin/*.beam $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/ebin
-install -m 644 include/*.hrl $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/include
+install -m 644 ebin/%{realname}*.beam $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/ebin
+install -m 644 include/%{realname}.hrl $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/include
 install -m 644 priv/sys.config $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/priv
 # Remove edoc config files (not needed for end-users)
 rm -f doc/edoc-info
@@ -59,7 +64,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %check
-#make %{?_smp_mflags} eunit
+rebar eunit -v
 
 
 %files
@@ -76,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue May 15 2012 Peter Lemenkov <lemenkov at gmail.com> - 0.2.11-1
+- Ver. 0.2.11 (fixes rhbz #824342)
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.5.20100929gitf0807c9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index e1da5e5..42ed4fc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a12693d660133f5735d5543673023621  uwiger-gproc-f0807c9.tar.gz
+a8e36f3bb08fbcec02d696f983157881  esl-gproc-v0.2.11-0-g781e0d0.tar.gz


More information about the scm-commits mailing list