[erlang-webmachine] Ver. 1.9.1
Peter Lemenkov
peter at fedoraproject.org
Fri May 18 13:46:52 UTC 2012
commit af9930817cc9fd2595aa5fffcbea9a559b2b8fcf
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Fri May 18 17:46:42 2012 +0400
Ver. 1.9.1
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
.gitignore | 1 +
...001-Do-not-check-for-deps-Fedora-specific.patch | 26 ------------
...ne-0001-Report-proper-version-1.9.0-1.9.1.patch | 29 ++++++++++++++
...002-Don-t-allow-rebar-to-manage-builddeps.patch | 28 +++++++++++++
...nused-include-to-shorten-dependency-chain.patch | 25 ------------
erlang-webmachine-0003-Kill-wrong-doc-info.patch | 36 +++++++++++++++++
...ne-0003-Report-proper-version-1.7.3-1.8.0.patch | 26 ------------
erlang-webmachine.spec | 41 ++++++++++---------
sources | 2 +-
9 files changed, 117 insertions(+), 97 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e1e843b..d41b645 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/basho-webmachine-webmachine-1.8.0-0-g15d815e.tar.gz
+/basho-webmachine-1.9.1-0-g97acb28.tar.gz
diff --git a/erlang-webmachine-0001-Report-proper-version-1.9.0-1.9.1.patch b/erlang-webmachine-0001-Report-proper-version-1.9.0-1.9.1.patch
new file mode 100644
index 0000000..3452995
--- /dev/null
+++ b/erlang-webmachine-0001-Report-proper-version-1.9.0-1.9.1.patch
@@ -0,0 +1,29 @@
+From 26f103908e0366bf899206d97fac6925f1f3a9a0 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Mon, 10 Jan 2011 21:15:30 +0300
+Subject: [PATCH 1/3] Report proper version (1.9.0 -> 1.9.1)
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+
+Conflicts:
+ src/webmachine_request.erl
+---
+ src/webmachine_request.erl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/webmachine_request.erl b/src/webmachine_request.erl
+index 8030798..8a4774b 100644
+--- a/src/webmachine_request.erl
++++ b/src/webmachine_request.erl
+@@ -79,7 +79,7 @@
+ -include("wm_reqstate.hrl").
+ -include("wm_reqdata.hrl").
+
+--define(WMVSN, "1.9.0").
++-define(WMVSN, "1.9.1").
+ -define(QUIP, "someone had painted it blue").
+ -define(IDLE_TIMEOUT, infinity).
+
+--
+1.7.10.2
+
diff --git a/erlang-webmachine-0002-Don-t-allow-rebar-to-manage-builddeps.patch b/erlang-webmachine-0002-Don-t-allow-rebar-to-manage-builddeps.patch
new file mode 100644
index 0000000..6056f07
--- /dev/null
+++ b/erlang-webmachine-0002-Don-t-allow-rebar-to-manage-builddeps.patch
@@ -0,0 +1,28 @@
+From 4076a0ba7e9a70912857dfece6f58ce400dfd2ee Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Fri, 18 May 2012 17:08:29 +0400
+Subject: [PATCH 2/3] Don't allow rebar to manage builddeps
+
+This patch is Fedora-specific.
+
+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 dc5bd68..5a0e8a5 100644
+--- a/rebar.config
++++ b/rebar.config
+@@ -2,8 +2,3 @@
+ {erl_opts, [warnings_as_errors]}.
+ {cover_enabled, true}.
+ {edoc_opts, [{preprocess, true}]}.
+-
+-{deps, [
+- {mochiweb, "1.5.1", {git, "git://github.com/basho/mochiweb",
+- {tag, "1.5.1-riak-1.0.x-fixes"}}}
+- ]}.
+--
+1.7.10.2
+
diff --git a/erlang-webmachine-0003-Kill-wrong-doc-info.patch b/erlang-webmachine-0003-Kill-wrong-doc-info.patch
new file mode 100644
index 0000000..0ea3d7c
--- /dev/null
+++ b/erlang-webmachine-0003-Kill-wrong-doc-info.patch
@@ -0,0 +1,36 @@
+From 108587143bbba29b644b62889e3a10ba6efdaadd Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Fri, 18 May 2012 17:16:19 +0400
+Subject: [PATCH 3/3] Kill wrong @doc info
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ src/webmachine_dispatcher.erl | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/src/webmachine_dispatcher.erl b/src/webmachine_dispatcher.erl
+index 1db2f40..d0e224c 100644
+--- a/src/webmachine_dispatcher.erl
++++ b/src/webmachine_dispatcher.erl
+@@ -26,18 +26,9 @@
+ -define(SEPARATOR, $\/).
+ -define(MATCH_ALL, '*').
+
+-%% @spec dispatch(Path::string(), DispatchList::[matchterm()]) ->
+-%% dispterm() | dispfail()
+-%% @doc Interface for URL dispatching.
+-%% See also http://bitbucket.org/justin/webmachine/wiki/DispatchConfiguration
+ dispatch(PathAsString, DispatchList, RD) ->
+ dispatch([], PathAsString, DispatchList, RD).
+
+-%% @spec dispatch(Host::string(), Path::string(),
+-%% DispatchList::[matchterm()]) ->
+-%% dispterm() | dispfail()
+-%% @doc Interface for URL dispatching.
+-%% See also http://bitbucket.org/justin/webmachine/wiki/DispatchConfiguration
+ dispatch(HostAsString, PathAsString, DispatchList, RD) ->
+ Path = string:tokens(PathAsString, [?SEPARATOR]),
+ % URIs that end with a trailing slash are implicitly one token
+--
+1.7.10.2
+
diff --git a/erlang-webmachine.spec b/erlang-webmachine.spec
index 3a62bd0..c0a764c 100644
--- a/erlang-webmachine.spec
+++ b/erlang-webmachine.spec
@@ -1,28 +1,30 @@
%global realname webmachine
+%global upstream basho
%global debug_package %{nil}
-%global git_tag 15d815e
+%global git_tag 97acb28
+%global patchnumber 0
Name: erlang-%{realname}
-Version: 1.8.0
-Release: 4%{?dist}
+Version: 1.9.1
+Release: 1%{?dist}
Summary: A REST-based system for building web applications
Group: Development/Languages
License: ASL 2.0
URL: http://webmachine.basho.com/
-# wget --no-check-certificate http://github.com/basho/webmachine/tarball/webmachine-1.8.0
-Source0: basho-webmachine-%{realname}-%{version}-0-g%{git_tag}.tar.gz
-Patch1: erlang-webmachine-0001-Do-not-check-for-deps-Fedora-specific.patch
-Patch2: erlang-webmachine-0002-Drop-unused-include-to-shorten-dependency-chain.patch
-Patch3: erlang-webmachine-0003-Report-proper-version-1.7.3-1.8.0.patch
+# wget --no-check-certificate --content-disposition https://github.com/basho/webmachine/tarball/1.9.1
+Source0: %{upstream}-%{realname}-%{version}-%{patchnumber}-g%{git_tag}.tar.gz
+Patch1: erlang-webmachine-0001-Report-proper-version-1.9.0-1.9.1.patch
+Patch2: erlang-webmachine-0002-Don-t-allow-rebar-to-manage-builddeps.patch
+Patch3: erlang-webmachine-0003-Kill-wrong-doc-info.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: erlang-erts
BuildRequires: erlang-mochiweb
BuildRequires: erlang-rebar
Requires: erlang-crypto
-Requires: erlang-erts >= R12B-5
-Requires: erlang-eunit
+# Error:erlang(lists:keyfind/3) in R12B and below
+Requires: erlang-erts >= R13B
Requires: erlang-inets
Requires: erlang-kernel
Requires: erlang-mochiweb
@@ -35,24 +37,22 @@ A REST-based system for building web applications.
%prep
-%setup -q -n basho-%{realname}-%{git_tag}
+%setup -q -n %{upstream}-%{realname}-d68705a
chmod 644 src/wmtrace_resource.erl
%patch1 -p1
%patch2 -p1
-%patch3 -p1
+#%patch3 -p1
chmod -x demo/start.sh
chmod -x priv/trace/wmtrace.css
chmod -x priv/trace/wmtrace.js
-chmod -x www/css/style.css
-chmod -x www/index.html
chmod +x priv/templates/start.sh
%build
-rebar compile
-make edoc
-rm -f docs/edoc-info
+rebar compile -v
+#make edoc
+#rm -f docs/edoc-info
%install
@@ -74,12 +74,12 @@ rm -rf $RPM_BUILD_ROOT
%check
-rebar skip_deps=true eunit
+rebar eunit -v
%files
%defattr(-,root,root,-)
-%doc demo doc docs/http-headers-status-v3.png LICENSE THANKS
+%doc demo docs/http-headers-status-v3.png LICENSE README.org THANKS
%dir %{_libdir}/erlang/lib/%{realname}-%{version}
%dir %{_libdir}/erlang/lib/%{realname}-%{version}/ebin
%dir %{_libdir}/erlang/lib/%{realname}-%{version}/include
@@ -93,6 +93,9 @@ rebar skip_deps=true eunit
%changelog
+* Fri May 18 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.9.1-1
+- Ver. 1.9.1
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 02f59dd..fc8dae0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-648165b0340ff02c331bdf54b00f5d85 basho-webmachine-webmachine-1.8.0-0-g15d815e.tar.gz
+1ac5db47ab2b6120ca0012a5f48c6be5 basho-webmachine-1.9.1-0-g97acb28.tar.gz
More information about the scm-commits
mailing list