rpms/erlang-mochiweb/devel erlang-mochiweb-0002-Fix-for-Erlang-OTP-R14A.patch, NONE, 1.1 erlang-mochiweb-0001-Fix-for-EPEL-5-erlang-R12B-5.patch, 1.1, 1.2 erlang-mochiweb.spec, 1.3, 1.4 import.log, 1.2, 1.3

[Peter Lemenkov]

Author: peter

Update of /cvs/pkgs/rpms/erlang-mochiweb/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24901/devel

Modified Files:
	erlang-mochiweb-0001-Fix-for-EPEL-5-erlang-R12B-5.patch 
	erlang-mochiweb.spec import.log 
Added Files:
	erlang-mochiweb-0002-Fix-for-Erlang-OTP-R14A.patch 
Log Message:
Fix for Erlang/OTP R14A

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

--- NEW FILE erlang-mochiweb-0002-Fix-for-Erlang-OTP-R14A.patch ---
>From 8a4b8f664668104c8d8cba28a8c8da5991464f4d 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 2/2] 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-0001-Fix-for-EPEL-5-erlang-R12B-5.patch:
 mochiglobal.erl  |    2 +-
 mochiweb.app.src |   11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

Index: erlang-mochiweb-0001-Fix-for-EPEL-5-erlang-R12B-5.patch
===================================================================
RCS file: /cvs/pkgs/rpms/erlang-mochiweb/devel/erlang-mochiweb-0001-Fix-for-EPEL-5-erlang-R12B-5.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- erlang-mochiweb-0001-Fix-for-EPEL-5-erlang-R12B-5.patch	8 Jun 2010 11:12:11 -0000	1.1
+++ erlang-mochiweb-0001-Fix-for-EPEL-5-erlang-R12B-5.patch	12 Jul 2010 10:21:18 -0000	1.2
@@ -1,7 +1,7 @@
-From 192949856eec7472594139028bdb0a68fdc633cd Mon Sep 17 00:00:00 2001
+From fbf18149f3666dfa9ca0f6e58844eb7ada5edfab Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Tue, 8 Jun 2010 14:52:56 +0400
-Subject: [PATCH] Fix for EPEL 5 (erlang R12B-5)
+Subject: [PATCH 1/2] Fix for EPEL 5 (erlang R12B-5)
 
 ---
  src/mochiglobal.erl  |    2 +-
@@ -43,5 +43,5 @@ index 5664003..17e7034 100644
    {mod, {mochiweb_app, []}},
    {env, []},
 -- 
-1.6.6.1
+1.7.1.1
 


Index: erlang-mochiweb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/erlang-mochiweb/devel/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:12:11 -0000	1.3
+++ erlang-mochiweb.spec	12 Jul 2010 10:21:19 -0000	1.4
@@ -4,7 +4,7 @@
 
 Name:		erlang-%{realname}
 Version:	1.3
-Release:	0.3.20100507svn159%{?dist}
+Release:	0.4.20100507svn159%{?dist}
 Summary:	An Erlang library for building lightweight HTTP servers
 Group:		Development/Libraries
 License:	MIT
@@ -13,11 +13,9 @@ URL:		http://code.google.com/p/mochiweb/
 ## 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
+Patch2:		erlang-mochiweb-0002-Fix-for-Erlang-OTP-R14A.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 +26,6 @@ Requires:	erlang-ssl
 Requires:	erlang-stdlib
 Requires:	erlang-syntax_tools
 Requires:	erlang-xmerl
-%endif
 Provides:	%{realname} = %{version}-%{release}
 
 %description
@@ -42,6 +39,7 @@ An Erlang library for building lightweig
 touch -r src/mochiglobal.erl.epel src/mochiglobal.erl
 touch -r src/mochiweb.app.src.epel src/mochiweb.app.src
 %endif
+%patch2 -p1 -b .R14A
 chmod 755 scripts/new_mochiweb.erl
 
 
@@ -120,6 +118,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	8 Jun 2010 11:12:11 -0000	1.2
+++ import.log	12 Jul 2010 10:21:19 -0000	1.3
@@ -1,2 +1,3 @@
 erlang-mochiweb-1_3-0_1_20100507svn159_fc12:HEAD:erlang-mochiweb-1.3-0.1.20100507svn159.fc12.src.rpm:1275905109
 erlang-mochiweb-1_3-0_3_20100507svn159_fc12:HEAD:erlang-mochiweb-1.3-0.3.20100507svn159.fc12.src.rpm:1275995485
+erlang-mochiweb-1_3-0_4_20100507svn159_fc12:HEAD:erlang-mochiweb-1.3-0.4.20100507svn159.fc12.src.rpm:1278930049