[erlang-edown] Ver. 0.3.1
Peter Lemenkov
peter at fedoraproject.org
Fri Oct 12 10:44:23 UTC 2012
commit fa27e346fa38fb4824ee890eb49d7dc92cbc457c
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Fri Oct 12 14:44:01 2012 +0400
Ver. 0.3.1
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
.gitignore | 1 +
erlang-edown-0001-Fix-for-EL5.patch | 22 +++++++++++-----------
erlang-edown.spec | 33 ++++++++++++++++++---------------
sources | 2 +-
4 files changed, 31 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 19d1268..0eb7e81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/esl-edown-v0.2.4-0-gdbdd41e.tar.gz
/esl-edown-0.3.0-0-g2a60bd1.tar.gz
+/esl-edown-0.3.1-0-gb89668e.tar.gz
diff --git a/erlang-edown-0001-Fix-for-EL5.patch b/erlang-edown-0001-Fix-for-EL5.patch
index 50fbbae..85477fc 100644
--- a/erlang-edown-0001-Fix-for-EL5.patch
+++ b/erlang-edown-0001-Fix-for-EL5.patch
@@ -1,4 +1,4 @@
-From 8015188693c88189f43d3baae61216a0044b5470 Mon Sep 17 00:00:00 2001
+From c9f4a565d8663dbd8b3c80df533403ae54432331 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
@@ -7,16 +7,16 @@ 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 ++++++------
+ 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
+index c9bf1ea..d7197c8 100644
--- a/src/edown_doclet.erl
+++ b/src/edown_doclet.erl
-@@ -154,7 +154,7 @@ right_suffix(File, Options) ->
+@@ -156,7 +156,7 @@ right_suffix(File, Options) ->
Base ++ Ext.
set_app_default(Opts) ->
@@ -25,7 +25,7 @@ index 5ab37dd..c603f58 100644
false ->
[{app_default, "http://www.erlang.org/doc/man"}|Opts];
_ ->
-@@ -191,12 +191,12 @@ make_top_level_README(Data, Dir, F, BaseHRef) ->
+@@ -193,12 +193,12 @@ make_top_level_README(Data, Dir, F, BaseHRef) ->
redirect_href(Attrs, Branch, BaseHRef) ->
AppBlob = BaseHRef ++ "/blob/" ++ Branch ++ "/",
@@ -55,10 +55,10 @@ index 81ca972..59f97bd 100644
A#xmlAttribute{value = URI}),
E#xmlElement{attributes = As1}.
diff --git a/src/edown_xmerl.erl b/src/edown_xmerl.erl
-index ced1f90..d17dbf3 100644
+index c029610..93e9b93 100644
--- a/src/edown_xmerl.erl
+++ b/src/edown_xmerl.erl
-@@ -125,12 +125,12 @@ html_elem(Tag, Data, Attrs, Parents, E) ->
+@@ -136,12 +136,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]),
@@ -75,7 +75,7 @@ index ced1f90..d17dbf3 100644
[ %%"\n",
xmerl_lib:start_tag(a,Attrs),
Data,
-@@ -140,8 +140,8 @@ md_elem(a, Data, Attrs, _Parents, _E) ->
+@@ -151,8 +151,8 @@ md_elem(a, Data, Attrs, _Parents, _E) ->
end
end;
md_elem(img, _Data, Attrs, _Parents, _E) ->
@@ -87,5 +87,5 @@ index ced1f90..d17dbf3 100644
md_elem(li, Data, _Attrs, [{ul,_}|_], _E) ->
["* ", strip(Data), "\n"];
--
-1.7.10.2
+1.7.12
diff --git a/erlang-edown.spec b/erlang-edown.spec
index e6b8768..4fde2c1 100644
--- a/erlang-edown.spec
+++ b/erlang-edown.spec
@@ -1,27 +1,28 @@
%global realname edown
%global upstream esl
%global debug_package %{nil}
-%global git_tag 2a60bd1
+%global git_tag b89668e
%global patchnumber 0
Name: erlang-%{realname}
-Version: 0.3.0
-Release: 2%{?dist}
+Version: 0.3.1
+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.3.0
+# wget --content-disposition https://github.com/esl/edown/tarball/0.3.1
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-edoc
BuildRequires: erlang-rebar
-Requires: erlang-edoc
-Requires: erlang-erts
-Requires: erlang-kernel
-Requires: erlang-stdlib
-Requires: erlang-xmerl
+Requires: erlang-edoc%{?_isa}
+Requires: erlang-erts%{?_isa}
+Requires: erlang-kernel%{?_isa}
+Requires: erlang-stdlib%{?_isa}
+Requires: erlang-xmerl%{?_isa}
%description
@@ -29,7 +30,7 @@ EDoc extension for generating Github-flavored Markdown.
%prep
-%setup -q -n %{upstream}-%{realname}-a5bc641
+%setup -q -n %{upstream}-%{realname}-%{git_tag}
%if 0%{?el5}
# Erlang/OTP R12B5
%patch1 -p1
@@ -39,22 +40,21 @@ sed -i -e "s,git,\"%{version}\",g" src/%{realname}.app.src
%build
rebar compile -v
-./make_doc
+rebar doc -v
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
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
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files
-%defattr(-,root,root,-)
-%doc NOTICE README.md
+%doc NOTICE README.md doc/
%dir %{_libdir}/erlang/lib/%{realname}-%{version}
%dir %{_libdir}/erlang/lib/%{realname}-%{version}/ebin
%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}.app
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Oct 12 2012 Peter Lemenkov <lemenkov at gmail.com> - 0.3.1-1
+- Ver. 0.3.1
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index abe40f5..69c4166 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e593f794bd152c4612aa9e1d9c754e83 esl-edown-0.3.0-0-g2a60bd1.tar.gz
+b04c59012a7a95b5a56472ff757ac5f0 esl-edown-0.3.1-0-gb89668e.tar.gz
More information about the scm-commits
mailing list