rpms/erlang-mochiweb/devel erlang-mochiweb-0001-Fix-for-EPEL-5-erlang-R12B-5.patch, NONE, 1.1 erlang-mochiweb.spec, 1.2, 1.3 import.log, 1.1, 1.2 sources, 1.2, 1.3
Peter Lemenkov
peter at fedoraproject.org
Tue Jun 8 11:12:11 UTC 2010
Author: peter
Update of /cvs/pkgs/rpms/erlang-mochiweb/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10239/devel
Modified Files:
erlang-mochiweb.spec import.log sources
Added Files:
erlang-mochiweb-0001-Fix-for-EPEL-5-erlang-R12B-5.patch
Log Message:
Fixed build for EL-5 and added tests
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(-)
--- NEW FILE erlang-mochiweb-0001-Fix-for-EPEL-5-erlang-R12B-5.patch ---
>From 192949856eec7472594139028bdb0a68fdc633cd 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)
---
src/mochiglobal.erl | 2 +-
src/mochiweb.app.src | 10 +++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/mochiglobal.erl b/src/mochiglobal.erl
index c740b87..a2a8c3a 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()) -> atom().
%% @doc Delete term stored at K, no-op if non-existent.
delete(K) ->
delete(K, key_to_module(K)).
diff --git a/src/mochiweb.app.src b/src/mochiweb.app.src
index 5664003..17e7034 100644
--- a/src/mochiweb.app.src
+++ b/src/mochiweb.app.src
@@ -2,7 +2,15 @@
{application, mochiweb,
[{description, "MochiMedia Web Server"},
{vsn, "1.3"},
- {modules, []},
+ {modules, [mochifmt,mochifmt_records,mochifmt_std,mochiglobal,
+ mochihex,mochijson,mochijson2,mochilists,mochinum,
+ mochitemp,mochiutf8,mochiweb,mochiweb_app,
+ mochiweb_charref,mochiweb_cookies,mochiweb_cover,
+ mochiweb_echo,mochiweb_headers,mochiweb_html,
+ mochiweb_http,mochiweb_io,mochiweb_mime,
+ mochiweb_multipart,mochiweb_request,mochiweb_response,
+ mochiweb_skel,mochiweb_socket,mochiweb_socket_server,
+ mochiweb_sup,mochiweb_util,reloader]},
{registered, []},
{mod, {mochiweb_app, []}},
{env, []},
--
1.6.6.1
Index: erlang-mochiweb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/erlang-mochiweb/devel/erlang-mochiweb.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- erlang-mochiweb.spec 7 Jun 2010 10:33:36 -0000 1.2
+++ erlang-mochiweb.spec 8 Jun 2010 11:12:11 -0000 1.3
@@ -4,14 +4,15 @@
Name: erlang-%{realname}
Version: 1.3
-Release: 0.2.20100507svn159%{?dist}
+Release: 0.3.20100507svn159%{?dist}
Summary: An Erlang library for building lightweight HTTP servers
Group: Development/Libraries
License: MIT
-## svn export -r 159 http://mochiweb.googlecode.com/svn/trunk/ erlang-mochiweb-1.3
-## tar cfz erlang-mochiweb-1.3.tar.gz erlang-mochiweb-1.3
URL: http://code.google.com/p/mochiweb/
-Source: %{name}-%{version}.tar.gz
+## 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
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: erlang
%if 0%{?el5}
@@ -36,10 +37,19 @@ An Erlang library for building lightweig
%prep
%setup -q
+%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
+%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}
@@ -53,6 +63,15 @@ install -m 644 ebin/*.beam $RPM_BUILD_RO
# skeleton files
cp -arv priv $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}
cp -arv scripts $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}
+cp -arv support $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}
+
+%check
+%if 0%{?el5}
+echo "Does not supported currently due to old erlang"
+%else
+make test
+%endif
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -97,8 +116,14 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/reloader.beam
%{_libdir}/erlang/lib/%{realname}-%{version}/priv
%{_libdir}/erlang/lib/%{realname}-%{version}/scripts
+%{_libdir}/erlang/lib/%{realname}-%{version}/support
+
%changelog
+* 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
+
* Mon Jun 7 2010 Peter Lemenkov <lemenkov at gmail.com> 1.3-0.2.20100507svn159
- Removed accidentally added macro
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/erlang-mochiweb/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 7 Jun 2010 10:06:37 -0000 1.1
+++ import.log 8 Jun 2010 11:12:11 -0000 1.2
@@ -1 +1,2 @@
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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/erlang-mochiweb/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 7 Jun 2010 10:06:37 -0000 1.2
+++ sources 8 Jun 2010 11:12:11 -0000 1.3
@@ -1 +1 @@
-2b3ddcfc398dd869b04f35badf7af0b0 erlang-mochiweb-1.3.tar.gz
+581f76bc0860eed4e086bf8cfc09b998 erlang-mochiweb-1.3.tar.gz
More information about the scm-commits
mailing list