[erlang-edown] Ver. 0.3.0
Peter Lemenkov
peter at fedoraproject.org
Fri Jun 1 11:34:47 UTC 2012
commit 89ab69f46034633098d2562c7a73ad619932abcf
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Fri Jun 1 15:34:37 2012 +0400
Ver. 0.3.0
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
.gitignore | 1 +
erlang-edown-0001-Fix-for-EL5.patch | 91 +++++++++++++++++++++++++++++++++++
erlang-edown.spec | 22 ++++++--
sources | 2 +-
4 files changed, 109 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b59e125..19d1268 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/esl-edown-v0.2.4-0-gdbdd41e.tar.gz
+/esl-edown-0.3.0-0-g2a60bd1.tar.gz
diff --git a/erlang-edown-0001-Fix-for-EL5.patch b/erlang-edown-0001-Fix-for-EL5.patch
new file mode 100644
index 0000000..50fbbae
--- /dev/null
+++ b/erlang-edown-0001-Fix-for-EL5.patch
@@ -0,0 +1,91 @@
+From 8015188693c88189f43d3baae61216a0044b5470 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Fri, 1 Jun 2012 15:29:18 +0400
+Subject: [PATCH 1/1] Fix for EL5
+
+There is no such function lists:keyfind/3 availabie in R12B.
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ src/edown_doclet.erl | 8 ++++----
+ src/edown_lib.erl | 2 +-
+ src/edown_xmerl.erl | 12 ++++++------
+ 3 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/src/edown_doclet.erl b/src/edown_doclet.erl
+index 5ab37dd..c603f58 100644
+--- a/src/edown_doclet.erl
++++ b/src/edown_doclet.erl
+@@ -154,7 +154,7 @@ right_suffix(File, Options) ->
+ Base ++ Ext.
+
+ set_app_default(Opts) ->
+- case lists:keyfind(app_default,1,Opts) of
++ case lists:keysearch(app_default,1,Opts) of
+ false ->
+ [{app_default, "http://www.erlang.org/doc/man"}|Opts];
+ _ ->
+@@ -191,12 +191,12 @@ make_top_level_README(Data, Dir, F, BaseHRef) ->
+
+ redirect_href(Attrs, Branch, BaseHRef) ->
+ AppBlob = BaseHRef ++ "/blob/" ++ Branch ++ "/",
+- case lists:keyfind(href, #xmlAttribute.name, Attrs) of
++ case lists:keysearch(href, #xmlAttribute.name, Attrs) of
+ false ->
+ false;
+- #xmlAttribute{value = "/" ++ _} ->
++ {value, #xmlAttribute{value = "/" ++ _}} ->
+ false;
+- #xmlAttribute{value = Href} = A ->
++ {value, #xmlAttribute{value = Href} = A} ->
+ case re:run(Href, ":", []) of
+ {match, _} ->
+ false;
+diff --git a/src/edown_lib.erl b/src/edown_lib.erl
+index 81ca972..59f97bd 100644
+--- a/src/edown_lib.erl
++++ b/src/edown_lib.erl
+@@ -72,7 +72,7 @@ redirect_uri(Href, _Name, E) ->
+ end.
+
+ replace_uri(URI, #xmlElement{attributes = As} = E) ->
+- #xmlAttribute{} = A = lists:keyfind(href, #xmlAttribute.name, As),
++ {value, #xmlAttribute{} = A} = lists:keysearch(href, #xmlAttribute.name, As),
+ As1 = lists:keyreplace(href, #xmlAttribute.name, As,
+ A#xmlAttribute{value = URI}),
+ E#xmlElement{attributes = As1}.
+diff --git a/src/edown_xmerl.erl b/src/edown_xmerl.erl
+index ced1f90..d17dbf3 100644
+--- a/src/edown_xmerl.erl
++++ b/src/edown_xmerl.erl
+@@ -125,12 +125,12 @@ html_elem(Tag, Data, Attrs, Parents, E) ->
+
+ md_elem(a, Data, Attrs, _Parents, _E) ->
+ %% io:fwrite("A TAG = ~p~nPs = ~p~n", [_E, _Parents]),
+- case lists:keyfind(href, #xmlAttribute.name, Attrs) of
+- #xmlAttribute{value = HRef} ->
++ case lists:keysearch(href, #xmlAttribute.name, Attrs) of
++ {value, #xmlAttribute{value = HRef}} ->
+ ["[", Data, "](", HRef, ")"];
+ false ->
+- case lists:keyfind(name, #xmlAttribute.name, Attrs) of
+- #xmlAttribute{} ->
++ case lists:keysearch(name, #xmlAttribute.name, Attrs) of
++ {value, #xmlAttribute{}} ->
+ [ %%"\n",
+ xmerl_lib:start_tag(a,Attrs),
+ Data,
+@@ -140,8 +140,8 @@ md_elem(a, Data, Attrs, _Parents, _E) ->
+ end
+ end;
+ md_elem(img, _Data, Attrs, _Parents, _E) ->
+- #xmlAttribute{value = Src} = lists:keyfind(src,#xmlAttribute.name,Attrs),
+- #xmlAttribute{value = Alt} = lists:keyfind(alt,#xmlAttribute.name,Attrs),
++ {value, #xmlAttribute{value = Src}} = lists:keysearch(src,#xmlAttribute.name,Attrs),
++ {value, #xmlAttribute{value = Alt}} = lists:keysearch(alt,#xmlAttribute.name,Attrs),
+ ["![", Alt, "](", Src, ")"];
+ md_elem(li, Data, _Attrs, [{ul,_}|_], _E) ->
+ ["* ", strip(Data), "\n"];
+--
+1.7.10.2
+
diff --git a/erlang-edown.spec b/erlang-edown.spec
index 9c9d93d..e83ce82 100644
--- a/erlang-edown.spec
+++ b/erlang-edown.spec
@@ -1,19 +1,20 @@
%global realname edown
%global upstream esl
%global debug_package %{nil}
-%global git_tag dbdd41e
+%global git_tag 2a60bd1
%global patchnumber 0
Name: erlang-%{realname}
-Version: 0.2.4
-Release: 2%{?dist}
+Version: 0.3.0
+Release: 1%{?dist}
Summary: EDoc extension for generating Github-flavored Markdown
Group: Development/Languages
License: ASL 2.0
URL: https://github.com/esl/edown
-# wget --no-check-certificate --content-disposition https://github.com/esl/edown/tarball/v0.2.4
-Source0: %{upstream}-%{realname}-v%{version}-%{patchnumber}-g%{git_tag}.tar.gz
+# wget --no-check-certificate --content-disposition https://github.com/esl/edown/tarball/v0.3.0
+Source0: %{upstream}-%{realname}-%{version}-%{patchnumber}-g%{git_tag}.tar.gz
+Patch1: erlang-edown-0001-Fix-for-EL5.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: erlang-rebar
Requires: erlang-edoc
@@ -28,7 +29,12 @@ EDoc extension for generating Github-flavored Markdown.
%prep
-%setup -q -n %{upstream}-%{realname}-6ca508b
+%setup -q -n %{upstream}-%{realname}-a5bc641
+%if 0%{?el5}
+# Erlang/OTP R12B5
+%patch1 -p1
+%endif
+sed -i -e "s,git,\"%{version}\",g" src/%{realname}.app.src
%build
@@ -56,6 +62,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jun 01 2012 Peter Lemenkov <lemenkov at gmail.com> - 0.3.0-1
+- Ver. 0.3.0
+- Fixed building on EL5
+
* Mon May 28 2012 Peter Lemenkov <lemenkov at gmail.com> - 0.2.4-2
- Use system-wide rebar
diff --git a/sources b/sources
index c3fecb1..abe40f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f556715c31f9eb95007341ff5e3b0799 esl-edown-v0.2.4-0-gdbdd41e.tar.gz
+e593f794bd152c4612aa9e1d9c754e83 esl-edown-0.3.0-0-g2a60bd1.tar.gz
More information about the scm-commits
mailing list