[erlang-webmachine] Ver. 1.10.0

[Peter Lemenkov]

commit 2dd800f703b47c8fcdb8d3f57e53373b6912a162
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Fri Mar 22 15:24:56 2013 +0400

    Ver. 1.10.0
    
    Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

 .gitignore                                         |    1 +
 erlang-webmachine-0001-Fix-rebar-builddeps.patch   |   13 ++++---
 ...02-Decode-Content-MD5-with-base64-not-hex.patch |   38 --------------------
 erlang-webmachine.spec                             |   14 ++++----
 sources                                            |    2 +-
 5 files changed, 16 insertions(+), 52 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 564be02..8438931 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /basho-webmachine-1.9.1-0-g97acb28.tar.gz
 /basho-webmachine-1.9.2-0-gf05a195.tar.gz
 /basho-webmachine-1.9.3-0-g33cd5f3.tar.gz
+/basho-webmachine-1.10.0-0-g100ce64.tar.gz
diff --git a/erlang-webmachine-0001-Fix-rebar-builddeps.patch b/erlang-webmachine-0001-Fix-rebar-builddeps.patch
index cb82139..551a5ab 100644
--- a/erlang-webmachine-0001-Fix-rebar-builddeps.patch
+++ b/erlang-webmachine-0001-Fix-rebar-builddeps.patch
@@ -1,17 +1,17 @@
-From 48953e6282b7dc32413810d953ca09783e3e1b3d Mon Sep 17 00:00:00 2001
+From 7177bcb5acfd8f696309c9b22b7531ffb692fffd 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 1/2] Fix rebar builddeps
+Subject: [PATCH 1/1] Fix rebar builddeps
 
 This patch is Fedora-specific.
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---
- rebar.config | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ rebar.config | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/rebar.config b/rebar.config
-index 25f43d5..660bdaa 100644
+index 7b83793..660bdaa 100644
 --- a/rebar.config
 +++ b/rebar.config
 @@ -4,6 +4,6 @@
@@ -19,8 +19,9 @@ index 25f43d5..660bdaa 100644
  
  {deps, [
 -        {mochiweb, "1.5.1*", {git, "git://github.com/basho/mochiweb",
+-                              {tag, "1.5.1p4"}}}
 +        {mochiweb, ".*", {git, "git://github.com/basho/mochiweb",
-                             {tag, "1.5.1p3"}}}
++                            {tag, "1.5.1p3"}}}
          ]}.
 -- 
 1.8.1.4
diff --git a/erlang-webmachine.spec b/erlang-webmachine.spec
index 74d870d..a141383 100644
--- a/erlang-webmachine.spec
+++ b/erlang-webmachine.spec
@@ -1,23 +1,21 @@
 %global realname webmachine
 %global upstream basho
 %global debug_package %{nil}
-%global git_tag 33cd5f3
+%global git_tag 100ce64
 %global patchnumber 0
 
 
 Name:		erlang-%{realname}
-Version:	1.9.3
+Version:	1.10.0
 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 --content-disposition https://github.com/basho/webmachine/tarball/1.9.3
+# wget --content-disposition https://github.com/basho/webmachine/tarball/1.10.0
 Source0:	%{upstream}-%{realname}-%{version}-%{patchnumber}-g%{git_tag}.tar.gz
 # Fedora/EPEL-specific
 Patch1:		erlang-webmachine-0001-Fix-rebar-builddeps.patch
-# Backported from upstream
-Patch2:		erlang-webmachine-0002-Decode-Content-MD5-with-base64-not-hex.patch
 BuildRequires:	erlang-mochiweb
 BuildRequires:	erlang-rebar
 Requires:	erlang-crypto%{?_isa}
@@ -35,10 +33,9 @@ A REST-based system for building web applications.
 
 
 %prep
-%setup -q -n %{upstream}-%{realname}-ddf03e3
+%setup -q -n %{upstream}-%{realname}-4e0a8ad
 chmod 644 src/wmtrace_resource.erl
 %patch1 -p1 -b .fixdep
-%patch2 -p1 -b .fix_fun_call
 chmod -x demo/start.sh
 chmod -x priv/trace/wmtrace.css
 chmod -x priv/trace/wmtrace.js
@@ -84,6 +81,9 @@ rebar eunit skip_deps=true -v
 
 
 %changelog
+* Fri Mar 22 2013 Peter Lemenkov <lemenkov at gmail.com> - 1.10.0-1
+- Ver. 1.10.0
+
 * Sun Mar 03 2013 Peter Lemenkov <lemenkov at gmail.com> - 1.9.3-1
 - Ver. 1.9.3
 
diff --git a/sources b/sources
index d332763..56f9717 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eae79d13e81f26a5dc75425783c4c9a8  basho-webmachine-1.9.3-0-g33cd5f3.tar.gz
+49af69cea9a9cc48dbbb017db40603d1  basho-webmachine-1.10.0-0-g100ce64.tar.gz