Tue Jul 13 12:01:01 UTC 2010

Author: peter

Update of /cvs/pkgs/rpms/erlang-mochiweb/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32580/EL-6

Modified Files:
	erlang-mochiweb.spec import.log 
Added Files:
	erlang-mochiweb-0001-Fix-for-Erlang-OTP-R14A.patch 
	erlang-mochiweb-0002-The-term-boolean-isn-t-availabie-in-R12B5.patch 
	erlang-mochiweb-0003-No-erlang-min-A-B-in-R12B-5-and-below.patch 
	erlang-mochiweb-0004-No-such-function-erl_scan-string-3-in-R12B5.patch 
	erlang-mochiweb-0005-No-such-function-lists-keyfind-3-in-R12B5-use-lists-.patch 
Removed Files:
	erlang-mochiweb-0001-Fix-for-EPEL-5-erlang-R12B-5.patch 
Log Message:
Rebased patches and simplified spec-file

erlang-mochiweb-0001-Fix-for-Erlang-OTP-R14A.patch:
 mochiweb_socket_server.erl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE erlang-mochiweb-0001-Fix-for-Erlang-OTP-R14A.patch ---
>From 750019901d43fe84dbe7920586faff7b06d230d2 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Mon, 12 Jul 2010 14:12:18 +0400
Subject: [PATCH 1/5] Fix for Erlang/OTP R14A

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
 src/mochiweb_socket_server.erl |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/mochiweb_socket_server.erl b/src/mochiweb_socket_server.erl
index aee0e91..b393dbe 100644
--- a/src/mochiweb_socket_server.erl
+++ b/src/mochiweb_socket_server.erl
@@ -103,6 +103,7 @@ start_server(State=#mochiweb_socket_server{ssl=Ssl, name=Name}) ->
     case Ssl of
         true ->
             application:start(crypto),
+            application:start(public_key),
             application:start(ssl);
         false ->
             void
-- 
1.7.1.1


erlang-mochiweb-0002-The-term-boolean-isn-t-availabie-in-R12B5.patch:
 mochiglobal.erl |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE erlang-mochiweb-0002-The-term-boolean-isn-t-availabie-in-R12B5.patch ---
>From c3a27987eeb99f8f2c68c9bdb6a25041cac0438a 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 2/5] The term boolean isn't availabie in R12B5

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
 src/mochiglobal.erl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mochiglobal.erl b/src/mochiglobal.erl
index c740b87..ec4668e 100644
--- a/src/mochiglobal.erl
+++ b/src/mochiglobal.erl
@@ -33,7 +33,7 @@ put(_K, V, Mod) ->
     code:load_binary(Mod, atom_to_list(Mod) ++ ".erl", Bin),
     ok.
 
--spec delete(atom()) -> boolean().
+-spec delete(atom()) -> bool().
 %% @doc Delete term stored at K, no-op if non-existent.
 delete(K) ->
     delete(K, key_to_module(K)).
-- 
1.7.1.1


erlang-mochiweb-0003-No-erlang-min-A-B-in-R12B-5-and-below.patch:
 mochiweb.erl |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE erlang-mochiweb-0003-No-erlang-min-A-B-in-R12B-5-and-below.patch ---
>From 4d2b684787905878b283b8f073934f2045571097 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 3/5] No erlang:min(A,B) in R12B-5 and below

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
 src/mochiweb.erl |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/mochiweb.erl b/src/mochiweb.erl
index 3118028..0e8fedb 100644
--- a/src/mochiweb.erl
+++ b/src/mochiweb.erl
@@ -282,7 +282,10 @@ client_headers(Body, IsLastRequest) ->
 drain_reply(_SockFun, 0, Acc) ->
     Acc;
 drain_reply(SockFun, Length, Acc) ->
-    Sz = erlang:min(Length, 1024),
+    Sz = case (Length < 1024) of
+	true -> Length;
+	_ -> 1024
+    end,
     {ok, B} = SockFun({recv, Sz}),
     drain_reply(SockFun, Length - Sz, <<Acc/bytes, B/bytes>>).
 
-- 
1.7.1.1


erlang-mochiweb-0004-No-such-function-erl_scan-string-3-in-R12B5.patch:
 make_app.escript |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE erlang-mochiweb-0004-No-such-function-erl_scan-string-3-in-R12B5.patch ---
>From 11f55e38e4bff9ad2784b2b7e6c4c035afbb5fa3 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 4/5] No such function - erl_scan:string/3 in R12B5

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
 support/make_app.escript |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/support/make_app.escript b/support/make_app.escript
index 0d0b84b..86519fb 100755
--- a/support/make_app.escript
+++ b/support/make_app.escript
@@ -27,7 +27,7 @@ write_app(F, Comments, TermL, App) ->
 parse_appsrc(F) ->
     case file:read_file(F) of
         {ok, B} ->
-            case erl_scan:string(binary_to_list(B), 1, [return_comments]) of
+            case erl_scan:string(binary_to_list(B), 1) of
                 {ok, Toks, _} ->
                     Comments = lists:takewhile(
                                  fun({comment,_,_}) -> true;
-- 
1.7.1.1


erlang-mochiweb-0005-No-such-function-lists-keyfind-3-in-R12B5-use-lists-.patch:
 src/mochilists.erl       |    6 +++---
 support/make_app.escript |    9 ++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

--- NEW FILE erlang-mochiweb-0005-No-such-function-lists-keyfind-3-in-R12B5-use-lists-.patch ---
>From 09d14bc23b5b7dd28a1ea1dad431b2d74ea7b566 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 5/5] No such function lists:keyfind/3 in R12B5 - use lists:keysearch/3 instead

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
 src/mochilists.erl       |    6 +++---
 support/make_app.escript |    8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/mochilists.erl b/src/mochilists.erl
index 8981e7b..6138acf 100644
--- a/src/mochilists.erl
+++ b/src/mochilists.erl
@@ -30,7 +30,7 @@ set_defaults(DefaultProps, Proplist) ->
 %% @doc Returns true if Propist contains at least one entry associated
 %%      with Key, otherwise false is returned.
 is_defined(Key, Proplist) ->
-    lists:keyfind(Key, 1, Proplist) =/= false.
+    lists:keysearch(Key, 1, Proplist) =/= false.
 
 
 %% @spec get_value(Key::term(), Proplist::list()) -> term() | undefined
@@ -45,10 +45,10 @@ get_value(Key, Proplist) ->
 get_value(_Key, [], Default) ->
     Default;
 get_value(Key, Proplist, Default) ->
-    case lists:keyfind(Key, 1, Proplist) of
+    case lists:keysearch(Key, 1, Proplist) of
         false ->
             Default;
-        {Key, Value} ->
+        {value, {Key, Value}} ->
             Value
     end.
 
diff --git a/support/make_app.escript b/support/make_app.escript
index 86519fb..65a5b0b 100755
--- a/support/make_app.escript
+++ b/support/make_app.escript
@@ -64,20 +64,20 @@ write_term(T, L0, TermL, Fd) ->
     io:fwrite(Fd, "~p.~n", [T]).
 
 vsn(Vsn, Attrs) when Vsn =:= '' orelse Vsn =:= "" ->
-    case lists:keyfind(vsn, 1, Attrs) of
+    case lists:keysearch(vsn, 1, Attrs) of
         false ->
             {vsn, "0.00"};
-        V ->
+        {value, V} ->
             V
     end;
 vsn(Vsn, _Attrs) ->
     {vsn, Vsn}.
 
 descr(Attrs) ->
-    case lists:keyfind(description, 1, Attrs) of
+    case lists:keysearch(description, 1, Attrs) of
         false ->
             {description, "auto_generated .app file"};
-        D ->
+        {value, D} ->
             D
     end.
 
-- 
1.7.1.1



Index: erlang-mochiweb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/erlang-mochiweb/EL-6/erlang-mochiweb.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- erlang-mochiweb.spec	8 Jun 2010 11:13:37 -0000	1.3
+++ erlang-mochiweb.spec	13 Jul 2010 12:01:00 -0000	1.4
@@ -4,7 +4,7 @@
 
 Name:		erlang-%{realname}
 Version:	1.3
-Release:	0.3.20100507svn159%{?dist}
+Release:	0.5.20100507svn159%{?dist}
 Summary:	An Erlang library for building lightweight HTTP servers
 Group:		Development/Libraries
 License:	MIT
@@ -12,12 +12,13 @@ URL:		http://code.google.com/p/mochiweb/
 ## svn export -r 97 http://mochiweb.googlecode.com/svn/trunk/ erlang-mochiweb-1.3
 ## tar cfz erlang-mochiweb-1.3.tar.gz erlang-mochiweb-1.3
 Source0:	%{name}-%{version}.tar.gz
-Patch1:		erlang-mochiweb-0001-Fix-for-EPEL-5-erlang-R12B-5.patch
+Patch1:		erlang-mochiweb-0001-Fix-for-Erlang-OTP-R14A.patch
+Patch2:		erlang-mochiweb-0002-The-term-boolean-isn-t-availabie-in-R12B5.patch
+Patch3:		erlang-mochiweb-0003-No-erlang-min-A-B-in-R12B-5-and-below.patch
+Patch4:		erlang-mochiweb-0004-No-such-function-erl_scan-string-3-in-R12B5.patch
+Patch5:		erlang-mochiweb-0005-No-such-function-lists-keyfind-3-in-R12B5-use-lists-.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	erlang
-%if 0%{?el5}
-Requires:	erlang
-%else
 Requires:	erlang-compiler
 Requires:	erlang-crypto
 Requires:	erlang-erts
@@ -28,7 +29,6 @@ Requires:	erlang-ssl
 Requires:	erlang-stdlib
 Requires:	erlang-syntax_tools
 Requires:	erlang-xmerl
-%endif
 Provides:	%{realname} = %{version}-%{release}
 
 %description
@@ -37,19 +37,18 @@ An Erlang library for building lightweig
 
 %prep
 %setup -q
+%patch1 -p1 -b .R14A
 %if 0%{?el5}
-%patch1 -p1 -b .epel
-touch -r src/mochiglobal.erl.epel src/mochiglobal.erl
-touch -r src/mochiweb.app.src.epel src/mochiweb.app.src
+# Erlang/OTP R12B5
+%patch2 -p1 -b .no-boolean
+%patch3 -p1 -b .no-erlang-min-2
+%patch4 -p1 -b .no-erl_scan-string-3
+%patch5 -p1 -b .no-lists-keyfind-3
 %endif
 chmod 755 scripts/new_mochiweb.erl
 
 
 %build
-%if 0%{?el5}
-# required on EPEL to suppress failures while autogenerating with old erlang
-cp -arv src/mochiweb.app.src ebin/mochiweb.app
-%endif
 make %{?_smp_mflags}
 
 
@@ -67,7 +66,7 @@ cp -arv support $RPM_BUILD_ROOT%{_libdir
 
 %check
 %if 0%{?el5}
-echo "Does not supported currently due to old erlang"
+echo "Mochiweb cannot pass self-tests (currently) due to old ssl in Erlang/OTP R12B5 - I'm working on it"
 %else
 make test
 %endif
@@ -120,6 +119,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jul 13 2010 Peter Lemenkov <lemenkov at gmail.com> 1.3-0.5.20100507svn159
+- Fixed several tests on EL-5 (enough to allow CouchDB to pass its own self-tests)
+
+* Mon Jul 12 2010 Peter Lemenkov <lemenkov at gmail.com> 1.3-0.4.20100507svn159
+- Rebuild with new Erlang
+- Simplified spec-file
+
 * Mon Jun  7 2010 Peter Lemenkov <lemenkov at gmail.com> 1.3-0.3.20100507svn159
 - Added %%check target and fixed mochiweb:test()
 - Fix EL-5 build


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/erlang-mochiweb/EL-6/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	8 Jun 2010 11:13:37 -0000	1.2
+++ import.log	13 Jul 2010 12:01:00 -0000	1.3
@@ -1,2 +1,3 @@
 erlang-mochiweb-1_3-0_1_20100507svn159_fc12:EL-6:erlang-mochiweb-1.3-0.1.20100507svn159.fc12.src.rpm:1275905399
 erlang-mochiweb-1_3-0_3_20100507svn159_fc12:EL-6:erlang-mochiweb-1.3-0.3.20100507svn159.fc12.src.rpm:1275995588
+erlang-mochiweb-1_3-0_5_20100507svn159_fc12:EL-6:erlang-mochiweb-1.3-0.5.20100507svn159.fc12.src.rpm:1279022333


--- erlang-mochiweb-0001-Fix-for-EPEL-5-erlang-R12B-5.patch DELETED ---

