[erlang-mochiweb] Fix for rhbz #601152
Peter Lemenkov
peter at fedoraproject.org
Thu Sep 30 08:06:04 UTC 2010
commit 7112d53ede02a4ad4d0854b56d9eaa4125aca4fb
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu Sep 30 12:06:00 2010 +0400
Fix for rhbz #601152
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
.gitignore | 1 +
...The-term-boolean-isn-t-availabie-in-R12B5.patch | 6 ++--
...002-No-erlang-min-A-B-in-R12B-5-and-below.patch | 6 ++--
...-such-function-erl_scan-string-3-in-R12B5.patch | 8 +++---
...ction-lists-keyfind-3-in-R12B5-use-lists-.patch | 8 +++---
...elated-tests-on-R12B-requires-ssl-example.patch | 6 ++--
...r-conversion-from-int-to-string-should-be.patch | 26 --------------------
erlang-mochiweb.spec | 20 ++++++++++-----
sources | 2 +-
9 files changed, 32 insertions(+), 51 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 371c747..4d1d0d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
erlang-mochiweb-1.3.tar.gz
+/mochi-mochiweb-47fe37b.tar.gz
diff --git a/erlang-mochiweb-0001-The-term-boolean-isn-t-availabie-in-R12B5.patch b/erlang-mochiweb-0001-The-term-boolean-isn-t-availabie-in-R12B5.patch
index 145798a..94fd483 100644
--- a/erlang-mochiweb-0001-The-term-boolean-isn-t-availabie-in-R12B5.patch
+++ b/erlang-mochiweb-0001-The-term-boolean-isn-t-availabie-in-R12B5.patch
@@ -1,7 +1,7 @@
-From 1868a3947adc52aafd27036fc28ae1c459bf5d08 Mon Sep 17 00:00:00 2001
+From a7fa787dcdea3336dcc65983f6cd497d41879458 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue, 13 Jul 2010 15:09:50 +0400
-Subject: [PATCH 1/6] The term boolean isn't availabie in R12B5
+Subject: [PATCH 1/5] The term boolean isn't availabie in R12B5
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -22,5 +22,5 @@ index c740b87..ec4668e 100644
delete(K) ->
delete(K, key_to_module(K)).
--
-1.7.2.1
+1.7.2.3
diff --git a/erlang-mochiweb-0002-No-erlang-min-A-B-in-R12B-5-and-below.patch b/erlang-mochiweb-0002-No-erlang-min-A-B-in-R12B-5-and-below.patch
index cb16028..526d5d9 100644
--- a/erlang-mochiweb-0002-No-erlang-min-A-B-in-R12B-5-and-below.patch
+++ b/erlang-mochiweb-0002-No-erlang-min-A-B-in-R12B-5-and-below.patch
@@ -1,7 +1,7 @@
-From 1351b93356bb540f7211fdbb7191961a45e3be89 Mon Sep 17 00:00:00 2001
+From 24c87cef7767f2b8c42f37cbd45078f3366a0083 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue, 13 Jul 2010 15:10:42 +0400
-Subject: [PATCH 2/6] No erlang:min(A,B) in R12B-5 and below
+Subject: [PATCH 2/5] No erlang:min(A,B) in R12B-5 and below
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -25,5 +25,5 @@ index 3118028..0e8fedb 100644
drain_reply(SockFun, Length - Sz, <<Acc/bytes, B/bytes>>).
--
-1.7.2.1
+1.7.2.3
diff --git a/erlang-mochiweb-0003-No-such-function-erl_scan-string-3-in-R12B5.patch b/erlang-mochiweb-0003-No-such-function-erl_scan-string-3-in-R12B5.patch
index e10c255..da26038 100644
--- a/erlang-mochiweb-0003-No-such-function-erl_scan-string-3-in-R12B5.patch
+++ b/erlang-mochiweb-0003-No-such-function-erl_scan-string-3-in-R12B5.patch
@@ -1,7 +1,7 @@
-From f95a72d3f13844b8d673f8dec1d397c400030c63 Mon Sep 17 00:00:00 2001
+From c66f2bdfad96603a61cfca9e17917e3373440fc2 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue, 13 Jul 2010 15:13:57 +0400
-Subject: [PATCH 3/6] No such function - erl_scan:string/3 in R12B5
+Subject: [PATCH 3/5] No such function - erl_scan:string/3 in R12B5
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -9,7 +9,7 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/support/make_app.escript b/support/make_app.escript
-index 0d0b84b..86519fb 100755
+index f56ff34..973dde9 100755
--- a/support/make_app.escript
+++ b/support/make_app.escript
@@ -27,7 +27,7 @@ write_app(F, Comments, TermL, App) ->
@@ -22,5 +22,5 @@ index 0d0b84b..86519fb 100755
Comments = lists:takewhile(
fun({comment,_,_}) -> true;
--
-1.7.2.1
+1.7.2.3
diff --git a/erlang-mochiweb-0004-No-such-function-lists-keyfind-3-in-R12B5-use-lists-.patch b/erlang-mochiweb-0004-No-such-function-lists-keyfind-3-in-R12B5-use-lists-.patch
index 0b530d2..5c89306 100644
--- a/erlang-mochiweb-0004-No-such-function-lists-keyfind-3-in-R12B5-use-lists-.patch
+++ b/erlang-mochiweb-0004-No-such-function-lists-keyfind-3-in-R12B5-use-lists-.patch
@@ -1,7 +1,7 @@
-From ac87470246b571d4e7852c2c5af8dba12be6042d Mon Sep 17 00:00:00 2001
+From a95dd73d8e074c8d9656e0f232b17054af836582 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue, 13 Jul 2010 15:16:13 +0400
-Subject: [PATCH 4/6] No such function lists:keyfind/3 in R12B5 - use lists:keysearch/3 instead
+Subject: [PATCH 4/5] No such function lists:keyfind/3 in R12B5 - use lists:keysearch/3 instead
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -52,7 +52,7 @@ index c0f5de8..4d5c0b3 100644
doit(From, To) ->
diff --git a/support/make_app.escript b/support/make_app.escript
-index 86519fb..65a5b0b 100755
+index 973dde9..1702265 100755
--- a/support/make_app.escript
+++ b/support/make_app.escript
@@ -64,20 +64,20 @@ write_term(T, L0, TermL, Fd) ->
@@ -81,5 +81,5 @@ index 86519fb..65a5b0b 100755
end.
--
-1.7.2.1
+1.7.2.3
diff --git a/erlang-mochiweb-0005-Fixed-ssl-related-tests-on-R12B-requires-ssl-example.patch b/erlang-mochiweb-0005-Fixed-ssl-related-tests-on-R12B-requires-ssl-example.patch
index 6d072d4..63d0208 100644
--- a/erlang-mochiweb-0005-Fixed-ssl-related-tests-on-R12B-requires-ssl-example.patch
+++ b/erlang-mochiweb-0005-Fixed-ssl-related-tests-on-R12B-requires-ssl-example.patch
@@ -1,7 +1,7 @@
-From 0b6e3ffcdb617945fbfb74787b57b95b0198f8b2 Mon Sep 17 00:00:00 2001
+From 41ac5d4139d51135eae4fb79208b1ce3ab69ee38 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue, 10 Aug 2010 16:10:45 +0400
-Subject: [PATCH 5/6] Fixed ssl-related tests on R12B (requires ssl/examples from Erlang/OTP)
+Subject: [PATCH 5/5] Fixed ssl-related tests on R12B (requires ssl/examples from Erlang/OTP)
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -94,5 +94,5 @@ index 3069cf4..8f37196 100644
{ok, {ssl, SslSocket}}
end,
--
-1.7.2.1
+1.7.2.3
diff --git a/erlang-mochiweb.spec b/erlang-mochiweb.spec
index 971880c..18fbb27 100644
--- a/erlang-mochiweb.spec
+++ b/erlang-mochiweb.spec
@@ -1,24 +1,25 @@
%global debug_package %{nil}
%global realname mochiweb
+%global git_tag 47fe37b
Name: erlang-%{realname}
Version: 1.3
-Release: 0.7.20100724git9a53dbd7%{?dist}
+Release: 0.8.20100929git%{git_tag}%{?dist}
Summary: An Erlang library for building lightweight HTTP servers
Group: Development/Libraries
License: MIT
URL: http://github.com/mochi/mochiweb
-# wget http://github.com/mochi/mochiweb/tarball/9a53dbd7b2c52eb5b9d4e90088ab471cac7b8ae9 -O erlang-mochiweb-1.3.tar.gz
-Source0: %{name}-%{version}.tar.gz
+# wget wget http://github.com/mochi/mochiweb/tarball/9687b40
+Source0: mochi-%{realname}-%{git_tag}.tar.gz
Patch1: erlang-mochiweb-0001-The-term-boolean-isn-t-availabie-in-R12B5.patch
Patch2: erlang-mochiweb-0002-No-erlang-min-A-B-in-R12B-5-and-below.patch
Patch3: erlang-mochiweb-0003-No-such-function-erl_scan-string-3-in-R12B5.patch
Patch4: erlang-mochiweb-0004-No-such-function-lists-keyfind-3-in-R12B5-use-lists-.patch
Patch5: erlang-mochiweb-0005-Fixed-ssl-related-tests-on-R12B-requires-ssl-example.patch
-Patch6: erlang-mochiweb-0006-Fix-improper-conversion-from-int-to-string-should-be.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires: erlang
+BuildRequires: erlang-erts
+BuildRequires: erlang-eunit
Requires: erlang-compiler
Requires: erlang-crypto
Requires: erlang-erts
@@ -31,12 +32,13 @@ Requires: erlang-syntax_tools
Requires: erlang-xmerl
Provides: %{realname} = %{version}-%{release}
+
%description
An Erlang library for building lightweight HTTP servers.
%prep
-%setup -q -n mochi-mochiweb-9a53dbd
+%setup -q -n mochi-%{realname}-%{git_tag}
%if 0%{?el5}
# Erlang/OTP R12B5
%patch1 -p1 -b .no-boolean
@@ -45,7 +47,6 @@ An Erlang library for building lightweight HTTP servers.
%patch4 -p1 -b .no-lists-keyfind-3
%patch5 -p1 -b .fix_for_ssl_cacert
%endif
-%patch6 -p1 -b .fix_int_to_string
chmod 755 scripts/new_mochiweb.erl
@@ -118,6 +119,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Sep 29 2010 Peter Lemenkov <lemenkov at gmail.com> - 1.3-0.8.20100929git9687b40
+- Narrowed BuildRequires
+- Restricted explicit requirement for obsoleted fd_server module (rhbz #601152)
+- Dropped upstreamed patch6
+
* Tue Aug 17 2010 Peter Lemenkov <lemenkov at gmail.com> - 1.3-0.7.20100724git9a53dbd7
- Fix improper int to string conversion
diff --git a/sources b/sources
index 4658312..0bc62fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0058fc8c8436d213eb18fd2d51091921 erlang-mochiweb-1.3.tar.gz
+b500826203d78ff60354f0892fb263e0 mochi-mochiweb-47fe37b.tar.gz
More information about the scm-commits
mailing list