[erlang-gtknode] Initial package (see rhbz #823017)
Peter Lemenkov
peter at fedoraproject.org
Sat Jun 9 18:43:58 UTC 2012
commit 8b45ecb260b9d001845c906befdfb21ad71e1439
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat Jun 9 22:43:48 2012 +0400
Initial package (see rhbz #823017)
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
.gitignore | 1 +
...B-compatibility-issue-re-run-instead-of-r.patch | 38 ++++++++++
...002-Fix-for-R15B-usage-of-deprecated-http.patch | 29 ++++++++
erlang-gtknode-0003-Off-by-one-error.patch | 26 +++++++
erlang-gtknode.spec | 76 ++++++++++++++++++++
sources | 1 +
6 files changed, 171 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..fb20b87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/massemanet-gtknode-19ddfd5.tar.gz
diff --git a/erlang-gtknode-0001-Fix-OTP-R15B-compatibility-issue-re-run-instead-of-r.patch b/erlang-gtknode-0001-Fix-OTP-R15B-compatibility-issue-re-run-instead-of-r.patch
new file mode 100644
index 0000000..0c01171
--- /dev/null
+++ b/erlang-gtknode-0001-Fix-OTP-R15B-compatibility-issue-re-run-instead-of-r.patch
@@ -0,0 +1,38 @@
+From 37e5834172adeabab3aae4352de594c98556d309 Mon Sep 17 00:00:00 2001
+From: Oleg Smirnov <oleg.smirnov at gmail.com>
+Date: Tue, 10 Apr 2012 19:00:13 +0300
+Subject: [PATCH 1/3] Fix OTP R15B compatibility issue (re:run instead of
+ regexp:match).
+
+---
+ priv/generator/generator.erl | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/priv/generator/generator.erl b/priv/generator/generator.erl
+index 4956606..46ba752 100644
+--- a/priv/generator/generator.erl
++++ b/priv/generator/generator.erl
+@@ -90,7 +90,7 @@ get_ix_http(Doc) ->
+
+ doc_links(Root,S)->
+ RE = "href=\"[A-Za-z-]+.html#id[0-9]+\">[a-z_]+ \\(\\)</a>",
+- {match,Ms} = regexp:matches(S,RE),
++ {match,Ms} = re:run(S,RE),
+ io:fwrite("got ~p links for ~s~n",[length(Ms),basename(dirname(Root))]),
+ foreach(fun({St,Le})-> do_doc_link(Root,string:substr(S,St,Le)) end, Ms).
+
+@@ -402,9 +402,9 @@ structs(StructsFile) ->
+ Structs = bio:string(StructsFile, fun do_structs/2, []),
+ foreach(fun ins_struct/1, Structs).
+ do_structs(Str, Acc) ->
+- case regexp:match(Str,"gn_construct_.*\\(") of
++ case re:run(Str,"gn_construct_.*\\(") of
+ nomatch -> Acc;
+- {match,St,Le} -> [string:substr(Str,St+13,Le-14)|Acc]
++ {match,[{St,Le}]} -> [string:substr(Str,St+13,Le-14)|Acc]
+ end.
+ ins_struct(S) -> ets:insert(types,#type{what=struct,cname=S,cast=""}).
+
+--
+1.7.10.2
+
diff --git a/erlang-gtknode-0002-Fix-for-R15B-usage-of-deprecated-http.patch b/erlang-gtknode-0002-Fix-for-R15B-usage-of-deprecated-http.patch
new file mode 100644
index 0000000..dc8f603
--- /dev/null
+++ b/erlang-gtknode-0002-Fix-for-R15B-usage-of-deprecated-http.patch
@@ -0,0 +1,29 @@
+From f609c30ed00750f4df55e563fb39f3b58085dd3f Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Fri, 18 May 2012 23:00:24 +0400
+Subject: [PATCH 2/3] Fix for R15B - usage of deprecated http
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ priv/generator/generator.erl | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/priv/generator/generator.erl b/priv/generator/generator.erl
+index 46ba752..249167f 100644
+--- a/priv/generator/generator.erl
++++ b/priv/generator/generator.erl
+@@ -77,9 +77,9 @@ get_ix_http(Doc) ->
+ [Px] -> ok
+ end,
+ [H,P] = string:tokens(Px,":"),
+- http:set_options([{proxy,{{H,list_to_integer(P)},[]}}])
++ httpc:set_options([{proxy,{{H,list_to_integer(P)},[]}}])
+ end,
+- ReqPid = spawn(fun() -> exit(http:request(Doc)) end),
++ ReqPid = spawn(fun() -> exit(httpc:request(Doc)) end),
+ ReqMon = erlang:monitor(process,ReqPid),
+ receive
+ {'DOWN',ReqMon,_,_,{ok,{_,_,S}}} -> S;
+--
+1.7.10.2
+
diff --git a/erlang-gtknode-0003-Off-by-one-error.patch b/erlang-gtknode-0003-Off-by-one-error.patch
new file mode 100644
index 0000000..a0d1628
--- /dev/null
+++ b/erlang-gtknode-0003-Off-by-one-error.patch
@@ -0,0 +1,26 @@
+From 10974788bcc172aba1c6532007a88e1fee139c08 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Thu, 7 Jun 2012 22:03:16 +0400
+Subject: [PATCH 3/3] Off-by one error
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ priv/generator/generator.erl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/priv/generator/generator.erl b/priv/generator/generator.erl
+index 249167f..06ca421 100644
+--- a/priv/generator/generator.erl
++++ b/priv/generator/generator.erl
+@@ -404,7 +404,7 @@ structs(StructsFile) ->
+ do_structs(Str, Acc) ->
+ case re:run(Str,"gn_construct_.*\\(") of
+ nomatch -> Acc;
+- {match,[{St,Le}]} -> [string:substr(Str,St+13,Le-14)|Acc]
++ {match,[{St,Le}]} -> [string:substr(Str,St+14,Le-14)|Acc]
+ end.
+ ins_struct(S) -> ets:insert(types,#type{what=struct,cname=S,cast=""}).
+
+--
+1.7.10.2
+
diff --git a/erlang-gtknode.spec b/erlang-gtknode.spec
new file mode 100644
index 0000000..05b5740
--- /dev/null
+++ b/erlang-gtknode.spec
@@ -0,0 +1,76 @@
+%global realname gtknode
+%global upstream massemanet
+%global git_tag 19ddfd5
+%global patchnumber 0
+%{?filter_setup:
+%filter_provides_in %{_libdir}/erlang/lib/.*\.so$
+%filter_setup
+}
+
+
+Name: erlang-%{realname}
+Version: 0.32
+Release: 2.20110310git19ddfd5%{?dist}
+Summary: Erlang GTK2 binding
+Group: Development/Languages
+License: MIT
+URL: https://github.com/massemanet/gtknode
+# wget --no-check-certificate --content-disposition https://github.com/massemanet/gtknode/tarball/19ddfd5
+Source0: %{upstream}-%{realname}-%{git_tag}.tar.gz
+# The following patches were sent upstream - https://github.com/massemanet/gtknode/pull/2
+Patch1: erlang-gtknode-0001-Fix-OTP-R15B-compatibility-issue-re-run-instead-of-r.patch
+Patch2: erlang-gtknode-0002-Fix-for-R15B-usage-of-deprecated-http.patch
+Patch3: erlang-gtknode-0003-Off-by-one-error.patch
+BuildRequires: erlang-erl_interface
+BuildRequires: erlang-rebar
+BuildRequires: gtk2-devel
+BuildRequires: libglade2-devel
+Requires: erlang-erts
+Requires: erlang-kernel
+Requires: erlang-stdlib
+
+
+%description
+Erlang GTK2 binding.
+
+
+%prep
+%setup -q -n %{upstream}-%{realname}-%{git_tag}
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
+
+%build
+autoreconf -ivf
+%{configure}
+make %{?_smp_mflags}
+
+
+%install
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+rm -rf %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/doc/
+rm -rf %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/examples/
+rm -rf %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/priv/src/
+rm -rf %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/src/
+
+
+%files
+%doc AUTHORS COPYING README doc/announce
+%dir %{_libdir}/erlang/lib/%{realname}-%{version}
+%dir %{_libdir}/erlang/lib/%{realname}-%{version}/ebin/
+%dir %{_libdir}/erlang/lib/%{realname}-%{version}/priv/
+%dir %{_libdir}/erlang/lib/%{realname}-%{version}/priv/bin/
+%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}.beam
+%{_libdir}/erlang/lib/%{realname}-%{version}/priv/bin/%{realname}
+
+
+%changelog
+* Thu Jun 07 2012 Peter Lemenkov <lemenkov at gmail.com> - 0.32-2.20110310git19ddfd5
+- Changed versioning scheme
+- Added comment about tarball retrieving
+- Fixed building with R15B
+
+* Fri May 18 2012 Peter Lemenkov <lemenkov at gmail.com> - 0.32-1
+- Ver. 0.32
diff --git a/sources b/sources
index e69de29..e0ef7ac 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+2bc23a1591bcad44f29f0be66b2e4e06 massemanet-gtknode-19ddfd5.tar.gz
More information about the scm-commits
mailing list