[erlang-js] Ver. 1.3.0
by Peter Lemenkov
commit 1b03031351391029f35d9e8e4bba44929d1d90c8
Author: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Sun Nov 16 23:45:02 2014 +0300
Ver. 1.3.0
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
.gitignore | 1 +
...-js-0001-Fix-building-of-linked-in-driver.patch | 108 ++++++++------------
erlang-js-0002-Build-with-js-1.7.0.patch | 80 ---------------
erlang-js-0002-build-fix-for-js-1.8.5.patch | 9 +--
...-Use-mochiweb-instead-of-a-bundled-copies.patch | 44 +++-----
...recated-driver_output_term-with-erl_drv_o.patch | 29 +++++
erlang-js.spec | 19 +++-
sources | 2 +-
8 files changed, 104 insertions(+), 188 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 72c23a6..21773d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/basho-erlang_js-1.2.1-0-gcd520bf.tar.gz
/basho-erlang_js-1.2.2-0-g54ecd5d.tar.gz
/erlang_js-1.2.2.tar.gz
+/erlang_js-1.3.0.tar.gz
diff --git a/erlang-js-0001-Fix-building-of-linked-in-driver.patch b/erlang-js-0001-Fix-building-of-linked-in-driver.patch
index 200eb0b..79c7643 100644
--- a/erlang-js-0001-Fix-building-of-linked-in-driver.patch
+++ b/erlang-js-0001-Fix-building-of-linked-in-driver.patch
@@ -1,70 +1,21 @@
-From 60a64af231322f4e7ae7855e11e1201041133e91 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Thu, 28 Oct 2010 12:26:25 +0400
-Subject: [PATCH 1/3] Fix building of linked-in driver
+Subject: [PATCH] Fix building of linked-in driver
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
----
- GNUmakefile | 27 ---
- Makefile | 23 +-
- build_docs.sh | 4 -
- c_src/Makefile | 62 -----
- c_src/build_driver_deps.sh | 11 -
- c_src/js-1.8.0-rc1.tar.gz | Bin 1310344 -> 0 bytes
- c_src/nsprpub-4.8.tar.gz | Bin 1189679 -> 0 bytes
- c_src/patches/js-src-Makefile.in.OS_RELEASE.patch | 11 -
- .../patches/js-src-Makefile.ref.LIB_ASFILES.patch | 14 --
- c_src/patches/js-src-Makefile.ref.jscpucfg.patch | 11 -
- c_src/patches/js-src-config-DragonFly.mk.patch | 97 --------
- c_src/patches/js-src-config-FreeBSD.mk.patch | 102 ---------
- c_src/patches/js-src-config-NetBSD.mk.patch | 103 ---------
- c_src/patches/js-src-config-OpenBSD.mk.patch | 103 ---------
- c_src/patches/js-src-config-SunOS5.10.mk.patch | 19 --
- .../patches/js-src-config-SunOS5.10_i86pc.mk.patch | 51 -----
- c_src/patches/js-src-config-SunOS5.11.mk.patch | 63 ------
- .../patches/js-src-config-SunOS5.11_i86pc.mk.patch | 51 -----
- .../patches/js-src-config-SunOS5.1x_i86pc.mk.patch | 72 ------
- c_src/patches/js-src-config.mk.patch | 39 ----
- c_src/patches/nspr-src-Makefile.in.patch | 16 --
- c_src/patches/nspr-src-configure.in.patch | 59 -----
- c_src/patches/nspr-src-configure.patch | 251 ---------------------
- c_src/patches/nspr-src-prnetdb.c.patch | 14 --
- rebar.config | 7 +-
- rebar.mk | 38 ----
- 26 files changed, 11 insertions(+), 1237 deletions(-)
- delete mode 100644 GNUmakefile
- delete mode 100755 build_docs.sh
- delete mode 100644 c_src/Makefile
- delete mode 100755 c_src/build_driver_deps.sh
- delete mode 100644 c_src/js-1.8.0-rc1.tar.gz
- delete mode 100644 c_src/nsprpub-4.8.tar.gz
- delete mode 100644 c_src/patches/js-src-Makefile.in.OS_RELEASE.patch
- delete mode 100644 c_src/patches/js-src-Makefile.ref.LIB_ASFILES.patch
- delete mode 100644 c_src/patches/js-src-Makefile.ref.jscpucfg.patch
- delete mode 100644 c_src/patches/js-src-config-DragonFly.mk.patch
- delete mode 100644 c_src/patches/js-src-config-FreeBSD.mk.patch
- delete mode 100644 c_src/patches/js-src-config-NetBSD.mk.patch
- delete mode 100644 c_src/patches/js-src-config-OpenBSD.mk.patch
- delete mode 100644 c_src/patches/js-src-config-SunOS5.10.mk.patch
- delete mode 100644 c_src/patches/js-src-config-SunOS5.10_i86pc.mk.patch
- delete mode 100644 c_src/patches/js-src-config-SunOS5.11.mk.patch
- delete mode 100644 c_src/patches/js-src-config-SunOS5.11_i86pc.mk.patch
- delete mode 100644 c_src/patches/js-src-config-SunOS5.1x_i86pc.mk.patch
- delete mode 100644 c_src/patches/js-src-config.mk.patch
- delete mode 100644 c_src/patches/nspr-src-Makefile.in.patch
- delete mode 100644 c_src/patches/nspr-src-configure.in.patch
- delete mode 100644 c_src/patches/nspr-src-configure.patch
- delete mode 100644 c_src/patches/nspr-src-prnetdb.c.patch
- delete mode 100644 rebar.mk
diff --git a/GNUmakefile b/GNUmakefile
deleted file mode 100644
-index 5b5775f..0000000
+index 5d16ac8..0000000
--- a/GNUmakefile
+++ /dev/null
-@@ -1,27 +0,0 @@
+@@ -1,61 +0,0 @@
+-all: deps compile
-
--all:
+-deps:
+- $(REBAR) get-deps
+-
+-compile:
- $(REBAR) compile
-
-verbose:
@@ -80,6 +31,9 @@ index 5b5775f..0000000
-c_src_clean:
- cd c_src; $(MAKE) clean
-
+-distclean: clean
+- $(REBAR) delete-deps
+-
-test: all
- $(REBAR) eunit
-
@@ -87,9 +41,36 @@ index 5b5775f..0000000
- @mkdir -p docs
- @./build_docs.sh
-
--.PHONY: c_src c_src_clean docs
+-.PHONY: c_src c_src_clean docs build_plt clean_plt
-
-include rebar.mk
+-
+-APPS = kernel stdlib sasl erts ssl tools os_mon runtime_tools crypto inets \
+- xmerl webtool snmp public_key mnesia eunit syntax_tools compiler
+-COMBO_PLT = $(HOME)/.erlang_js_dialyzer_plt
+-
+-check_plt: compile
+- dialyzer --check_plt --plt $(COMBO_PLT) --apps $(APPS) ebin
+-
+-build_plt: compile
+- dialyzer --build_plt --output_plt $(COMBO_PLT) --apps $(APPS) ebin
+-
+-dialyzer: compile
+- @echo
+- @echo Use "'make check_plt'" to check PLT prior to using this target.
+- @echo Use "'make build_plt'" to build PLT prior to using this target.
+- @echo
+- @sleep 1
+- dialyzer -Wunmatched_returns -Werror_handling -Wrace_conditions \
+- -Wunderspecs --plt $(COMBO_PLT) ebin
+-
+-cleanplt:
+- @echo
+- @echo "Are you sure? It takes about 1/2 hour to re-build."
+- @echo Deleting $(COMBO_PLT) in 5 seconds.
+- @ech
+- sleep 5
+- rm $(COMBO_PLT)
diff --git a/Makefile b/Makefile
index dd7df14..df3c065 100644
--- a/Makefile
@@ -1404,11 +1385,11 @@ index b4fb0e9..0000000
- #if (defined(__GLIBC__) && __GLIBC__ >= 2 && !defined(XP_BEOS))
- #define _PR_HAVE_GETPROTO_R
diff --git a/rebar.config b/rebar.config
-index d065f01..ea70993 100644
+index 5849de0..5a6bb36 100644
--- a/rebar.config
+++ b/rebar.config
-@@ -8,8 +8,8 @@
- {erl_opts, [warnings_as_errors]}.
+@@ -10,8 +10,8 @@
+ {port_specs, [{"priv/erlang_js_drv.so", ["c_src/*.c"]}]}.
{port_env, [
- {"DRV_CFLAGS", "$DRV_CFLAGS -I c_src/system/include/js -DXP_UNIX -Wall"},
@@ -1418,7 +1399,7 @@ index d065f01..ea70993 100644
%% Define flags for enabling/disable 64 bit build of NSPR
{"-32$", "NSPR_SIXTYFOUR", "--disable-64bit"},
-@@ -33,6 +33,3 @@
+@@ -39,6 +39,3 @@
{"freebsd.*", "MAKEFLAGS", ""}
]}.
@@ -1469,6 +1450,3 @@ index bfb4156..0000000
- $(REBAR_FETCH) > ./rebar
- chmod u+x ./rebar
-
---
-1.8.1.4
-
diff --git a/erlang-js-0002-build-fix-for-js-1.8.5.patch b/erlang-js-0002-build-fix-for-js-1.8.5.patch
index 896d5d1..d354624 100644
--- a/erlang-js-0002-build-fix-for-js-1.8.5.patch
+++ b/erlang-js-0002-build-fix-for-js-1.8.5.patch
@@ -1,11 +1,7 @@
-From 92291cd4589d5863d0d285507459a86a5f57bd90 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky(a)redhat.com>
Date: Tue, 3 Jul 2012 19:03:44 +0400
-Subject: [PATCH 2/3] build fix for js 1.8.5
+Subject: [PATCH] build fix for js 1.8.5
----
- c_src/spidermonkey.c | 43 +++++++++++++++++++++++++------------------
- 1 file changed, 25 insertions(+), 18 deletions(-)
diff --git a/c_src/spidermonkey.c b/c_src/spidermonkey.c
index 623c109..07ba29e 100644
@@ -118,6 +114,3 @@ index 623c109..07ba29e 100644
}
else {
retval = error_to_json(state->error);
---
-1.8.1.4
-
diff --git a/erlang-js-0003-Use-mochiweb-instead-of-a-bundled-copies.patch b/erlang-js-0003-Use-mochiweb-instead-of-a-bundled-copies.patch
index 6310cd5..223ff5d 100644
--- a/erlang-js-0003-Use-mochiweb-instead-of-a-bundled-copies.patch
+++ b/erlang-js-0003-Use-mochiweb-instead-of-a-bundled-copies.patch
@@ -1,38 +1,27 @@
-From 92b4604553417b4ce9d41c1495832b32edcdf48e Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Tue, 3 Jul 2012 22:50:21 +0400
-Subject: [PATCH 3/3] Use mochiweb instead of a bundled copies
+Subject: [PATCH] Use mochiweb instead of a bundled copies
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
----
- src/erlang_js.app.src | 2 +-
- src/js.erl | 6 +-
- src/js_driver.erl | 6 +-
- src/js_mochijson2.erl | 782 --------------------------------------------------
- src/js_mochinum.erl | 290 -------------------
- test/eval_tests.erl | 2 +-
- 6 files changed, 8 insertions(+), 1080 deletions(-)
- delete mode 100644 src/js_mochijson2.erl
- delete mode 100644 src/js_mochinum.erl
diff --git a/src/erlang_js.app.src b/src/erlang_js.app.src
-index 35be53a..b211daa 100644
+index 9634c30..14ef037 100644
--- a/src/erlang_js.app.src
+++ b/src/erlang_js.app.src
-@@ -2,7 +2,7 @@
+@@ -1,7 +1,7 @@
+ % -*- mode: erlang -*-
{application, erlang_js,
[{description, "Interface between BEAM and JS"},
- {vsn, "1.2.2"},
-- {modules, [erlang_js, erlang_js_sup, js, js_benchmark, js_cache, js_driver, js_drv_comm, js_memory, js_mochijson2, js_mochinum]},
-+ {modules, [erlang_js, erlang_js_sup, js, js_benchmark, js_cache, js_driver, js_drv_comm, js_memory]},
+- {vsn, git},
++ {vsn, "1.3.0"},
+ {modules, [erlang_js, erlang_js_sup, js, js_benchmark, js_cache, js_driver, js_drv_comm, js_memory, js_mochijson2, js_mochinum]},
{registered, [erlang_js_sup, js_cache]},
{applications, [kernel, stdlib, sasl]},
- {mod, {erlang_js, []}}]}.
diff --git a/src/js.erl b/src/js.erl
-index 05f5e2b..1debfc9 100644
+index dfe8c32..811958c 100644
--- a/src/js.erl
+++ b/src/js.erl
-@@ -69,11 +69,11 @@ build_bindings([{VarName, Value}|T], Accum) ->
+@@ -70,11 +70,11 @@ build_bindings([{VarName, Value}|T], Accum) ->
false ->
VarName
end,
@@ -48,7 +37,7 @@ index 05f5e2b..1debfc9 100644
- build_arg_list(T, [[js_mochijson2:encode(H), ","]|Accum]).
+ build_arg_list(T, [[mochijson2:encode(H), ","]|Accum]).
diff --git a/src/js_driver.erl b/src/js_driver.erl
-index b86418f..123be7f 100644
+index 31c4b80..581a351 100644
--- a/src/js_driver.erl
+++ b/src/js_driver.erl
@@ -129,7 +129,7 @@ define_js(Ctx, FileName, Js, Timeout) when is_binary(FileName),
@@ -58,9 +47,9 @@ index b86418f..123be7f 100644
- {struct, [{<<"error">>, {struct, Error}}]} = js_mochijson2:decode(ErrorJson),
+ {struct, [{<<"error">>, {struct, Error}}]} = mochijson2:decode(ErrorJson),
{error, Error};
- ok ->
- ok
-@@ -147,9 +147,9 @@ eval_js(Ctx, {file, FileName}, Timeout) ->
+ {error, Error} ->
+ {error, Error};
+@@ -149,9 +149,9 @@ eval_js(Ctx, {file, FileName}, Timeout) ->
eval_js(Ctx, Js, Timeout) when is_binary(Js) ->
case call_driver(Ctx, "ej", [<<"<unnamed>">>, jsonify(Js)], Timeout) of
{ok, Result} ->
@@ -1157,10 +1146,10 @@ index ca09ca6..0000000
- {0.99999999999999989, 1024} = frexp(LargeNorm),
- ok.
diff --git a/test/eval_tests.erl b/test/eval_tests.erl
-index bee664f..83db9e9 100644
+index b6dee3d..5dd05b2 100644
--- a/test/eval_tests.erl
+++ b/test/eval_tests.erl
-@@ -79,7 +79,7 @@ charset_test_() ->
+@@ -84,7 +84,7 @@ charset_test_() ->
json_test_() ->
[fun() ->
Struct = {struct, [{<<"test">>, <<"1">>}]},
@@ -1169,6 +1158,3 @@ index bee664f..83db9e9 100644
ejslog_test_() ->
[{setup, fun test_util:port_setup/0,
---
-1.8.1.4
-
diff --git a/erlang-js-0004-Replace-deprecated-driver_output_term-with-erl_drv_o.patch b/erlang-js-0004-Replace-deprecated-driver_output_term-with-erl_drv_o.patch
new file mode 100644
index 0000000..1f91546
--- /dev/null
+++ b/erlang-js-0004-Replace-deprecated-driver_output_term-with-erl_drv_o.patch
@@ -0,0 +1,29 @@
+From: Peter Lemenkov <lemenkov(a)gmail.com>
+Date: Sun, 16 Nov 2014 23:32:26 +0300
+Subject: [PATCH] Replace deprecated driver_output_term with
+ erl_drv_output_term
+
+Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
+
+diff --git a/c_src/spidermonkey_drv.c b/c_src/spidermonkey_drv.c
+index aa17cef..5e09dba 100644
+--- a/c_src/spidermonkey_drv.c
++++ b/c_src/spidermonkey_drv.c
+@@ -79,7 +79,7 @@ void send_immediate_ok_response(spidermonkey_drv_t *dd, const char *call_id) {
+ ErlDrvTermData terms[] = {ERL_DRV_BUF2BINARY, (ErlDrvTermData) call_id, strlen(call_id),
+ ERL_DRV_ATOM, dd->atom_ok,
+ ERL_DRV_TUPLE, 2};
+- driver_output_term(dd->port, terms, sizeof(terms) / sizeof(terms[0]));
++ erl_drv_output_term(driver_mk_port(dd->port), terms, sizeof(terms) / sizeof(terms[0]));
+ }
+
+ #define COPY_DATA(CD, CID, TERMS) \
+@@ -253,7 +253,7 @@ ready_async(ErlDrvData handle, ErlDrvThreadData async_data)
+ spidermonkey_drv_t *dd = (spidermonkey_drv_t *) handle;
+ js_call *call_data = (js_call *) async_data;
+
+- driver_output_term(dd->port,
++ erl_drv_output_term(driver_mk_port(dd->port),
+ call_data->return_terms, call_data->return_term_count);
+
+ driver_free_binary(call_data->args);
diff --git a/erlang-js.spec b/erlang-js.spec
index 63f47d7..6fe809a 100644
--- a/erlang-js.spec
+++ b/erlang-js.spec
@@ -1,4 +1,5 @@
%global realname erlang_js
+%global upstream basho
%{?filter_setup:
%filter_provides_in %{_libdir}/erlang/lib/.*\.so$
%filter_setup
@@ -8,20 +9,24 @@
Name: erlang-js
-Version: 1.2.2
-Release: 8%{?dist}
+Version: 1.3.0
+Release: 1%{?dist}
Summary: A Friendly Erlang to Javascript Binding
Group: Development/Libraries
License: ASL 2.0
-URL: https://github.com/basho/erlang_js
-VCS: scm:git:https://github.com/basho/erlang_js.git
-Source0: https://github.com/basho/erlang_js/archive/%{version}/%{realname}-%{versi...
+URL: http://github.com/%{upstream}/%{realname}
+%if 0%{?el7}%{?fedora}
+VCS: scm:git:https://github.com/%{upstream}/%{realname}.git
+%endif
+Source0: https://github.com/%{upstream}/%{realname}/archive/%{version}/%{realname}...
# Fedora-specific
Patch1: erlang-js-0001-Fix-building-of-linked-in-driver.patch
# Fedora-specific
Patch2: erlang-js-0002-build-fix-for-js-1.8.5.patch
# Fedora-specific
Patch3: erlang-js-0003-Use-mochiweb-instead-of-a-bundled-copies.patch
+# Fedora-specific
+Patch4: erlang-js-0004-Replace-deprecated-driver_output_term-with-erl_drv_o.patch
BuildRequires: erlang-rebar
BuildRequires: erlang-rpm-macros >= 0.1.4
BuildRequires: erlang-mochiweb
@@ -46,6 +51,7 @@ rm -f c_src/nsprpub-4.8.tar.gz
%patch2 -p1 -b .building_with_js_1_8_5
%patch3 -p1 -b .use_globally_available_mochiweb
+%patch4 -p1 -b .fix_deprecated
%build
@@ -81,6 +87,9 @@ install -m 755 priv/%{realname}_drv.so $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{re
%changelog
+* Sun Nov 16 2014 Peter Lemenkov <lemenkov(a)gmail.com> - 1.3.0-1
+- Ver. 1.3.0
+
* Tue Nov 04 2014 Peter Lemenkov <lemenkov(a)gmail.com> - 1.2.2-8
- Rebuild with Erlang 17.3.3
diff --git a/sources b/sources
index dc3be75..09a3d27 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8d4ad224885b01f20dc0a8cfc19cf779 erlang_js-1.2.2.tar.gz
+92ef59b5d1b1068aeab9822dfa92c7ed erlang_js-1.3.0.tar.gz
9 years, 6 months
[erlang-neotoma/f21] Ver. 1.7.0
by Peter Lemenkov
Summary of changes:
c2966cf... Ver. 1.7.0 (*)
(*) This commit already existed in another branch; no separate mail sent
9 years, 6 months
[erlang-neotoma] Ver. 1.7.0
by Peter Lemenkov
commit c2966cf5cf2e212931fe3aa953caef1bb12c9a4f
Author: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Sun Nov 16 22:15:54 2014 +0300
Ver. 1.7.0
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
.gitignore | 1 +
erlang-neotoma.spec | 22 ++++++++++++----------
sources | 2 +-
3 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 361fbb3..6c10443 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/seancribbs-neotoma-1.5-0-gadb132b.tar.gz
/seancribbs-neotoma-1.5.1-0-g6382470.tar.gz
/seancribbs-neotoma-1.6.0-0-gaa9559a.tar.gz
+/neotoma-1.7.2.tar.gz
diff --git a/erlang-neotoma.spec b/erlang-neotoma.spec
index d73187a..0bfde98 100644
--- a/erlang-neotoma.spec
+++ b/erlang-neotoma.spec
@@ -1,19 +1,19 @@
%global realname neotoma
%global upstream seancribbs
%global debug_package %{nil}
-%global git_tag aa9559a
-%global patchnumber 0
Name: erlang-%{realname}
-Version: 1.6.0
-Release: 4%{?dist}
+Version: 1.7.2
+Release: 1%{?dist}
Summary: Erlang library and packrat parser-generator for parsing expression grammars
Group: Development/Languages
License: MIT
-URL: http://github.com/seancribbs/neotoma
-# wget --content-disposition https://github.com/seancribbs/neotoma/tarball/1.6.0
-Source0: %{upstream}-%{realname}-%{version}-%{patchnumber}-g%{git_tag}.tar.gz
+URL: http://github.com/%{upstream}/%{realname}
+%if 0%{?el7}%{?fedora}
+VCS: scm:git:https://github.com/%{upstream}/%{realname}.git
+%endif
+Source0: https://github.com/%{upstream}/%{realname}/archive/%{version}/%{realname}...
BuildRequires: erlang-rebar
# ets:insert/2 ( >= R12B-5 )
# ets:insert_new/2 ( >= R12B-5 )
@@ -34,7 +34,8 @@ Erlang library and packrat parser-generator for parsing expression grammars.
%prep
-%setup -q -n %{upstream}-%{realname}-%{git_tag}
+%setup -q -n %{realname}-%{version}
+sed -i -e "s,git,\"%{version}\",g" src/%{realname}.app.src
%build
@@ -45,7 +46,6 @@ rebar compile -v
install -p -m 0644 -D ebin/%{realname}.app %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}.app
install -p -m 0644 ebin/%{realname}.beam %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/ebin
install -p -m 0644 ebin/%{realname}_parse.beam %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/ebin
-install -p -m 0644 ebin/%{realname}_peg.beam %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/ebin
install -p -m 0644 -D priv/peg_includes.hrl %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/priv/peg_includes.hrl
install -p -m 0644 priv/neotoma_parse.peg %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/priv
@@ -62,12 +62,14 @@ rebar eunit -v
%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}.app
%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}.beam
%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}_parse.beam
-%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}_peg.beam
%{_libdir}/erlang/lib/%{realname}-%{version}/priv/peg_includes.hrl
%{_libdir}/erlang/lib/%{realname}-%{version}/priv/neotoma_parse.peg
%changelog
+* Sun Nov 16 2014 Peter Lemenkov <lemenkov(a)gmail.com> - 1.7.2-1
+- Ver. 1.7.0
+
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.6.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index a668359..04e18c3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5afda276cb3148a35927ba83848fca54 seancribbs-neotoma-1.6.0-0-gaa9559a.tar.gz
+3e20514f2670d42602d019fe1254beee neotoma-1.7.2.tar.gz
9 years, 6 months
[erlang-oauth/f21] Ver. 1.5.0
by Peter Lemenkov
Summary of changes:
6b1dfa2... Ver. 1.5.0 (*)
(*) This commit already existed in another branch; no separate mail sent
9 years, 6 months
[erlang-oauth] Ver. 1.5.0
by Peter Lemenkov
commit 6b1dfa2bd6512fc6a0c5d8b2e98d169b69fc7af2
Author: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Sun Nov 16 21:56:50 2014 +0300
Ver. 1.5.0
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
.gitignore | 1 +
...time-switching-with-parse_transform-rewri.patch | 2 +-
erlang-oauth.spec | 15 +++++++++++----
sources | 2 +-
4 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6a70dd5..b4be3a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ erlang-oauth-0.gite8aecf0.tar.bz2
/tim-erlang-oauth-v1.0.1-0-g2c9269b.tar.gz
/tim-erlang-oauth-v1.1.1-0-g18cee77.tar.gz
/erlang-oauth-1.4.0.tar.gz
+/erlang-oauth-1.5.0.tar.gz
diff --git a/erlang-oauth-0001-Replace-runtime-switching-with-parse_transform-rewri.patch b/erlang-oauth-0001-Replace-runtime-switching-with-parse_transform-rewri.patch
index 85b0135..b773880 100644
--- a/erlang-oauth-0001-Replace-runtime-switching-with-parse_transform-rewri.patch
+++ b/erlang-oauth-0001-Replace-runtime-switching-with-parse_transform-rewri.patch
@@ -63,7 +63,7 @@ index 0000000..1eb917f
+recursive_rewrite(Term) ->
+ Term.
diff --git a/src/oauth.erl b/src/oauth.erl
-index d9234f4..d5de04b 100644
+index 908a569..9a0d733 100644
--- a/src/oauth.erl
+++ b/src/oauth.erl
@@ -128,7 +128,7 @@ hmac_sha1_signature(HttpMethod, URL, Params, Consumer, TokenSecret) ->
diff --git a/erlang-oauth.spec b/erlang-oauth.spec
index 0ae1565..131d0d4 100644
--- a/erlang-oauth.spec
+++ b/erlang-oauth.spec
@@ -1,15 +1,19 @@
%global realname oauth
+%global upstream tim
%global debug_package %{nil}
Name: erlang-%{realname}
-Version: 1.4.0
-Release: 3%{?dist}
+Version: 1.5.0
+Release: 1%{?dist}
Summary: An Erlang OAuth implementation
Group: Development/Languages
License: MIT
-URL: https://github.com/tim/erlang-oauth
-Source0: https://github.com/tim/erlang-oauth/archive/v%{version}/%{name}-%{version...
+URL: http://github.com/%{upstream}/%{name}
+%if 0%{?el7}%{?fedora}
+VCS: scm:git:https://github.com/%{upstream}/%{name}.git
+%endif
+Source0: https://github.com/%{upstream}/%{name}/archive/v%{version}/%{name}-%{vers...
Patch1: erlang-oauth-0001-Replace-runtime-switching-with-parse_transform-rewri.patch
BuildRequires: erlang-erts
BuildRequires: erlang-public_key
@@ -53,6 +57,9 @@ install -D -m 644 ebin/%{realname}.beam $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{r
%changelog
+* Sun Nov 16 2014 Peter Lemenkov <lemenkov(a)gmail.com> - 1.5.0-1
+- Ver. 1.5.0
+
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.4.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index 4c3e534..1dc1f75 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ce6833322e1f02c4d0084395650a4d31 erlang-oauth-1.4.0.tar.gz
+8ee950067d5532146d1f05106a3e341b erlang-oauth-1.5.0.tar.gz
9 years, 6 months
[erlang-getopt/f21] Ver. 0.8.2
by Peter Lemenkov
Summary of changes:
e34474a... Ver. 0.8.2 (*)
(*) This commit already existed in another branch; no separate mail sent
9 years, 6 months
[erlang-getopt] Ver. 0.8.2
by Peter Lemenkov
commit e34474ab8c368abce879038b55c1806a166bf2d5
Author: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Sun Nov 16 20:47:29 2014 +0300
Ver. 0.8.2
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
erlang-getopt.spec | 11 ++++++++---
getopt-0001-Fix-edoc-compilation.patch | 20 ++++++++++++++++++++
2 files changed, 28 insertions(+), 3 deletions(-)
---
diff --git a/erlang-getopt.spec b/erlang-getopt.spec
index 7e1cfa5..ab695a5 100644
--- a/erlang-getopt.spec
+++ b/erlang-getopt.spec
@@ -5,7 +5,7 @@
Name: erlang-%{realname}
Version: 0.8.2
-Release: 0%{?dist}
+Release: 1%{?dist}
Summary: Erlang module to parse command line arguments using the GNU getopt syntax
Group: Development/Libraries
License: BSD
@@ -14,6 +14,7 @@ URL: http://github.com/%{upstream}/%{realname}
VCS: scm:git:https://github.com/%{upstream}/%{realname}.git
%endif
Source0: https://github.com/%{upstream}/%{realname}/archive/v%{version}/%{realname...
+Patch1: getopt-0001-Fix-edoc-compilation.patch
BuildRequires: erlang-rebar
Requires: erlang-erts%{?_isa} >= R13B
Requires: erlang-stdlib%{?_isa} >= R13B
@@ -26,16 +27,17 @@ Command-line parsing module that uses a syntax similar to that of GNU getopt.
%prep
%setup -q -n %{realname}-%{version}
chmod 0644 examples/*.escript
+%patch1 -p1 -b .fix_edoc
%build
rebar compile -v
-#rebar doc -v
+rebar doc -v
%check
# BEWARE rebar needs bootstrapped getopt in case of an API change
-# rebar eunit -v
+rebar eunit -v
%install
@@ -52,6 +54,9 @@ install -D -m 644 ebin/%{realname}.beam %{buildroot}%{_libdir}/erlang/lib/%{real
%changelog
+* Sun Nov 16 2014 Peter Lemenkov <lemenkov(a)gmail.com> - 0.8.2-1
+- Ver. 0.8.2
+
* Sun Nov 16 2014 Peter Lemenkov <lemenkov(a)gmail.com> - 0.8.2-0
- Bootstrap ver. 0.8.2 with disabled tests
diff --git a/getopt-0001-Fix-edoc-compilation.patch b/getopt-0001-Fix-edoc-compilation.patch
new file mode 100644
index 0000000..15682b8
--- /dev/null
+++ b/getopt-0001-Fix-edoc-compilation.patch
@@ -0,0 +1,20 @@
+From f2f14f36092f296174269e7a040d145ded429df4 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov(a)gmail.com>
+Date: Sun, 16 Nov 2014 20:21:21 +0300
+Subject: [PATCH] Fix edoc compilation
+
+Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
+
+diff --git a/src/getopt.erl b/src/getopt.erl
+index e32ae12..fb61057 100644
+--- a/src/getopt.erl
++++ b/src/getopt.erl
+@@ -892,7 +892,7 @@ get_env_var(Prefix, Suffix, []) ->
+ Prefix ++ Suffix.
+
+
+--spec line_length() -> 0..?LINE_LENGTH.
++-spec line_length() -> 0..75.
+ line_length() ->
+ case io:columns() of
+ {ok, Columns} when Columns < ?LINE_LENGTH ->
9 years, 6 months