rpms/couchdb/devel couchdb0.11.0-0009-fix-issue-COUCHDB-805.-tested-on-R13B-04-and-R14A.-a.patch, NONE, 1.1 couchdb.spec, 1.23, 1.24 couchdb0.11.0-0001-Force-init-script-installation.patch, 1.1, 1.2 couchdb0.11.0-0002-Install-into-erllibdir-by-default.patch, 1.1, 1.2 couchdb0.11.0-0003-Remove-bundled-erlang-oauth-library.patch, 1.1, 1.2 couchdb0.11.0-0004-Remove-bundled-erlang-etap-library.patch, 1.1, 1.2 couchdb0.11.0-0005-Remove-bundled-mochiweb-library.patch, 1.1, 1.2 couchdb0.11.0-0006-Remove-pid-file-after-stop.patch, 1.1, 1.2 couchdb0.11.0-0007-Remove-bundled-ibrowse-library.patch, 1.1, 1.2 couchdb0.11.0-0008-Workaround-for-system-wide-ibrowse.patch, 1.1, 1.2 import.log, 1.19, 1.20
Peter Lemenkov
peter at fedoraproject.org
Tue Jul 13 08:23:57 UTC 2010
- Previous message: rpms/xbean/devel import.log, NONE, 1.1 pom-3.7.patch, NONE, 1.1 xbean.depmap, NONE, 1.1 xbean.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: File maven-shade-plugin-1.3.3.tar.xz uploaded to lookaside cache by sochotni
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: peter
Update of /cvs/pkgs/rpms/couchdb/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9163/devel
Modified Files:
couchdb.spec
couchdb0.11.0-0001-Force-init-script-installation.patch
couchdb0.11.0-0002-Install-into-erllibdir-by-default.patch
couchdb0.11.0-0003-Remove-bundled-erlang-oauth-library.patch
couchdb0.11.0-0004-Remove-bundled-erlang-etap-library.patch
couchdb0.11.0-0005-Remove-bundled-mochiweb-library.patch
couchdb0.11.0-0006-Remove-pid-file-after-stop.patch
couchdb0.11.0-0007-Remove-bundled-ibrowse-library.patch
couchdb0.11.0-0008-Workaround-for-system-wide-ibrowse.patch
import.log
Added Files:
couchdb0.11.0-0009-fix-issue-COUCHDB-805.-tested-on-R13B-04-and-R14A.-a.patch
Log Message:
Fix building/running with Erlang/OTP R14A
couchdb0.11.0-0009-fix-issue-COUCHDB-805.-tested-on-R13B-04-and-R14A.-a.patch:
couch_app.erl | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE couchdb0.11.0-0009-fix-issue-COUCHDB-805.-tested-on-R13B-04-and-R14A.-a.patch ---
>From a6a7c1c849ee8493aac0c30f9b8f687989d45c35 Mon Sep 17 00:00:00 2001
From: Benoit Chesneau <benoitc at apache.org>
Date: Sat, 19 Jun 2010 12:24:41 +0000
Subject: [PATCH 9/9] fix issue COUCHDB-805. tested on R13B-04 and R14A. also public_key is available since R12B5.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@956220 13f79535-47bb-0310-9956-ffa450edef68
---
src/couchdb/couch_app.erl | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/couchdb/couch_app.erl b/src/couchdb/couch_app.erl
index 1b64434..c16412a 100644
--- a/src/couchdb/couch_app.erl
+++ b/src/couchdb/couch_app.erl
@@ -20,7 +20,7 @@
start(_Type, DefaultIniFiles) ->
IniFiles = get_ini_files(DefaultIniFiles),
- case start_apps([crypto, sasl, inets, oauth, ssl, ibrowse, mochiweb]) of
+ case start_apps([crypto, public_key, sasl, inets, oauth, ssl, ibrowse, mochiweb]) of
ok ->
couch_server_sup:start_link(IniFiles);
{error, Reason} ->
--
1.7.1.1
Index: couchdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/devel/couchdb.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- couchdb.spec 22 Jun 2010 04:42:16 -0000 1.23
+++ couchdb.spec 13 Jul 2010 08:23:54 -0000 1.24
@@ -4,7 +4,7 @@
Name: couchdb
Version: 0.11.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A document database server, accessible via a RESTful JSON API
Group: Applications/Databases
@@ -20,6 +20,7 @@ Patch5: couchdb0.11.0-0005-Remove-bundl
Patch6: couchdb0.11.0-0006-Remove-pid-file-after-stop.patch
Patch7: couchdb0.11.0-0007-Remove-bundled-ibrowse-library.patch
Patch8: couchdb0.11.0-0008-Workaround-for-system-wide-ibrowse.patch
+Patch9: couchdb0.11.0-0009-fix-issue-COUCHDB-805.-tested-on-R13B-04-and-R14A.-a.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: curl-devel
@@ -73,6 +74,7 @@ JavaScript acting as the default view de
%patch6 -p1 -b .remove_pid_file
%patch7 -p1 -b .remove_bundled_ibrowse
%patch8 -p1 -b .workaround_for_ssl
+%patch9 -p1 -b .R14A
# Restore original timestamps to avoid reconfiguring
touch -r configure.ac.initenabled configure.ac
touch -r configure.fix_lib_path configure
@@ -152,6 +154,9 @@ fi
%changelog
+* Sun Jul 11 2010 Peter Lemenkov <lemenkov at gmail.com> 0.11.0-3
+- Compatibility with Erlang R14A (see patch9)
+
* Tue Jun 22 2010 Peter Lemenkov <lemenkov at gmail.com> 0.11.0-2
- Massive spec cleanup
couchdb0.11.0-0001-Force-init-script-installation.patch:
configure.ac | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
Index: couchdb0.11.0-0001-Force-init-script-installation.patch
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/devel/couchdb0.11.0-0001-Force-init-script-installation.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- couchdb0.11.0-0001-Force-init-script-installation.patch 18 Jun 2010 07:41:47 -0000 1.1
+++ couchdb0.11.0-0001-Force-init-script-installation.patch 13 Jul 2010 08:23:55 -0000 1.2
@@ -1,7 +1,7 @@
-From e8baba930e96e1474d52e718c5215346f19816a9 Mon Sep 17 00:00:00 2001
+From 0c98ac31fd550a2c8e24ea99cbc892d163f64026 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu, 27 May 2010 15:17:20 +0400
-Subject: [PATCH 1/8] Force init script installation
+Subject: [PATCH 1/9] Force init script installation
---
configure.ac | 16 +++-------------
@@ -35,5 +35,5 @@ index 679c6ca..f2a9f7e 100644
if test "$use_launchd" = "yes"; then
--
-1.6.6.1
+1.7.1.1
couchdb0.11.0-0002-Install-into-erllibdir-by-default.patch:
configure | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
Index: couchdb0.11.0-0002-Install-into-erllibdir-by-default.patch
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/devel/couchdb0.11.0-0002-Install-into-erllibdir-by-default.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- couchdb0.11.0-0002-Install-into-erllibdir-by-default.patch 18 Jun 2010 07:41:47 -0000 1.1
+++ couchdb0.11.0-0002-Install-into-erllibdir-by-default.patch 13 Jul 2010 08:23:55 -0000 1.2
@@ -1,7 +1,7 @@
-From f57afe1dc587a7b5178ee38a693837e443138c4b Mon Sep 17 00:00:00 2001
+From 8ce17bd19f2a8565efc4a656af0aaeba89b89d6b Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu, 27 May 2010 15:18:29 +0400
-Subject: [PATCH 2/8] Install into erllibdir by default
+Subject: [PATCH 2/9] Install into erllibdir by default
---
configure | 4 ++--
@@ -30,5 +30,5 @@ index 7bdf280..c5f079f 100755
localerlanglibdir=${locallibdir}/erlang/lib
--
-1.6.6.1
+1.7.1.1
couchdb0.11.0-0003-Remove-bundled-erlang-oauth-library.patch:
b/configure | 3
b/configure.ac | 1
b/src/Makefile.am | 2
b/src/Makefile.in | 2
b/test/etap/test_util.erl.in | 3
src/erlang-oauth/Makefile.am | 49 ---
src/erlang-oauth/Makefile.in | 482 -----------------------------------
src/erlang-oauth/oauth.app.in | 20 -
src/erlang-oauth/oauth.erl | 107 -------
src/erlang-oauth/oauth_hmac_sha1.erl | 11
src/erlang-oauth/oauth_http.erl | 22 -
src/erlang-oauth/oauth_plaintext.erl | 10
src/erlang-oauth/oauth_unix.erl | 16 -
src/erlang-oauth/oauth_uri.erl | 88 ------
14 files changed, 3 insertions(+), 813 deletions(-)
Index: couchdb0.11.0-0003-Remove-bundled-erlang-oauth-library.patch
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/devel/couchdb0.11.0-0003-Remove-bundled-erlang-oauth-library.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- couchdb0.11.0-0003-Remove-bundled-erlang-oauth-library.patch 18 Jun 2010 07:41:47 -0000 1.1
+++ couchdb0.11.0-0003-Remove-bundled-erlang-oauth-library.patch 13 Jul 2010 08:23:55 -0000 1.2
@@ -1,7 +1,7 @@
-From cbfa100bb7468bd433f45ec7ff46faa0b36b85d9 Mon Sep 17 00:00:00 2001
+From bee4d1cad2fa778302d89619d3ac147afb54ba31 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu, 27 May 2010 15:19:51 +0400
-Subject: [PATCH 3/8] Remove bundled erlang-oauth library
+Subject: [PATCH 3/9] Remove bundled erlang-oauth library
---
configure | 3 -
@@ -958,5 +958,5 @@ index 4c42edb..79b0417 100644
code:add_pathz(filename:join([builddir(), "src", Name]))
end, Paths).
--
-1.6.6.1
+1.7.1.1
couchdb0.11.0-0004-Remove-bundled-erlang-etap-library.patch:
b/configure | 3
b/configure.ac | 1
b/src/Makefile.am | 2
b/src/Makefile.in | 2
b/test/etap/test_util.erl.in | 3
src/etap/Makefile.am | 44 ---
src/etap/Makefile.in | 474 ------------------------------------------
src/etap/etap.erl | 416 ------------------------------------
src/etap/etap_application.erl | 72 ------
src/etap/etap_can.erl | 79 -------
src/etap/etap_exception.erl | 66 -----
src/etap/etap_process.erl | 42 ---
src/etap/etap_report.erl | 343 ------------------------------
src/etap/etap_request.erl | 89 -------
src/etap/etap_string.erl | 47 ----
src/etap/etap_web.erl | 65 -----
16 files changed, 3 insertions(+), 1745 deletions(-)
Index: couchdb0.11.0-0004-Remove-bundled-erlang-etap-library.patch
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/devel/couchdb0.11.0-0004-Remove-bundled-erlang-etap-library.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- couchdb0.11.0-0004-Remove-bundled-erlang-etap-library.patch 18 Jun 2010 07:41:47 -0000 1.1
+++ couchdb0.11.0-0004-Remove-bundled-erlang-etap-library.patch 13 Jul 2010 08:23:55 -0000 1.2
@@ -1,7 +1,7 @@
-From c39746b2622bcdc9f93b0d03288b8976e30d8870 Mon Sep 17 00:00:00 2001
+From a76767a387aa0f5e3cd0ccac746ccf609b5ae9af Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu, 27 May 2010 15:22:37 +0400
-Subject: [PATCH 4/8] Remove bundled erlang-etap library
+Subject: [PATCH 4/9] Remove bundled erlang-etap library
---
configure | 3 -
@@ -1906,5 +1906,5 @@ index 79b0417..c57d7a8 100644
code:add_pathz(filename:join([builddir(), "src", Name]))
end, Paths).
--
-1.6.6.1
+1.7.1.1
couchdb0.11.0-0005-Remove-bundled-mochiweb-library.patch:
b/configure | 3
b/configure.ac | 1
b/src/Makefile.am | 2
b/src/Makefile.in | 2
b/test/etap/test_util.erl.in | 3
src/mochiweb/Makefile.am | 80 --
src/mochiweb/Makefile.in | 513 ------------------
src/mochiweb/mochifmt.erl | 426 ---------------
src/mochiweb/mochifmt_records.erl | 30 -
src/mochiweb/mochifmt_std.erl | 23
src/mochiweb/mochihex.erl | 75 --
src/mochiweb/mochijson.erl | 528 ------------------
src/mochiweb/mochijson2.erl | 663 -----------------------
src/mochiweb/mochinum.erl | 289 ----------
src/mochiweb/mochiweb.app.in | 32 -
src/mochiweb/mochiweb.erl | 110 ---
src/mochiweb/mochiweb_app.erl | 20
src/mochiweb/mochiweb_charref.erl | 295 ----------
src/mochiweb/mochiweb_cookies.erl | 257 ---------
src/mochiweb/mochiweb_echo.erl | 31 -
src/mochiweb/mochiweb_headers.erl | 251 --------
src/mochiweb/mochiweb_html.erl | 893 --------------------------------
src/mochiweb/mochiweb_http.erl | 152 -----
src/mochiweb/mochiweb_multipart.erl | 530 ------------------
src/mochiweb/mochiweb_request.erl | 867 -------------------------------
src/mochiweb/mochiweb_response.erl | 56 --
src/mochiweb/mochiweb_skel.erl | 73 --
src/mochiweb/mochiweb_socket_server.erl | 248 --------
src/mochiweb/mochiweb_sup.erl | 34 -
src/mochiweb/mochiweb_util.erl | 859 ------------------------------
src/mochiweb/reloader.erl | 123 ----
31 files changed, 3 insertions(+), 7466 deletions(-)
Index: couchdb0.11.0-0005-Remove-bundled-mochiweb-library.patch
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/devel/couchdb0.11.0-0005-Remove-bundled-mochiweb-library.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- couchdb0.11.0-0005-Remove-bundled-mochiweb-library.patch 18 Jun 2010 07:41:47 -0000 1.1
+++ couchdb0.11.0-0005-Remove-bundled-mochiweb-library.patch 13 Jul 2010 08:23:55 -0000 1.2
@@ -1,7 +1,7 @@
-From 2b794d728dbedbdc5f8674c26673fc7d8da319ec Mon Sep 17 00:00:00 2001
+From b037885f8ca781a7d09d8596d2fd6d76c5c18373 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Mon, 7 Jun 2010 15:08:06 +0400
-Subject: [PATCH 5/8] Remove bundled mochiweb library
+Subject: [PATCH 5/9] Remove bundled mochiweb library
---
configure | 3 -
@@ -7747,5 +7747,5 @@ index c57d7a8..948958c 100644
code:add_pathz(filename:join([builddir(), "src", Name]))
end, Paths).
--
-1.6.6.1
+1.7.1.1
couchdb0.11.0-0006-Remove-pid-file-after-stop.patch:
couchdb.tpl.in | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
Index: couchdb0.11.0-0006-Remove-pid-file-after-stop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/devel/couchdb0.11.0-0006-Remove-pid-file-after-stop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- couchdb0.11.0-0006-Remove-pid-file-after-stop.patch 18 Jun 2010 07:41:47 -0000 1.1
+++ couchdb0.11.0-0006-Remove-pid-file-after-stop.patch 13 Jul 2010 08:23:55 -0000 1.2
@@ -1,7 +1,7 @@
-From 92ebf37de7a56b188ccffc1b35d47c8963ec3c67 Mon Sep 17 00:00:00 2001
+From 6f1c037b3dfef569070620dc98341e257ae176ea Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Mon, 7 Jun 2010 15:08:42 +0400
-Subject: [PATCH 6/8] Remove pid-file after stop
+Subject: [PATCH 6/9] Remove pid-file after stop
---
bin/couchdb.tpl.in | 4 +---
@@ -24,5 +24,5 @@ index bdea97f..a7d8e12 100644
if kill -1 $PID 2> /dev/null; then
if test "$1" = "false"; then
--
-1.6.6.1
+1.7.1.1
couchdb0.11.0-0007-Remove-bundled-ibrowse-library.patch:
b/configure | 3
b/configure.ac | 1
b/src/Makefile.am | 2
b/src/Makefile.in | 2
b/test/etap/test_util.erl.in | 3
src/ibrowse/Makefile.am | 49 -
src/ibrowse/Makefile.in | 482 -----------
src/ibrowse/ibrowse.app.in | 13
src/ibrowse/ibrowse.erl | 760 ------------------
src/ibrowse/ibrowse.hrl | 12
src/ibrowse/ibrowse_app.erl | 64 -
src/ibrowse/ibrowse_http_client.erl | 1476 ------------------------------------
src/ibrowse/ibrowse_lb.erl | 216 -----
src/ibrowse/ibrowse_lib.erl | 399 ---------
src/ibrowse/ibrowse_sup.erl | 65 -
src/ibrowse/ibrowse_test.erl | 377 ---------
16 files changed, 3 insertions(+), 3921 deletions(-)
Index: couchdb0.11.0-0007-Remove-bundled-ibrowse-library.patch
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/devel/couchdb0.11.0-0007-Remove-bundled-ibrowse-library.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- couchdb0.11.0-0007-Remove-bundled-ibrowse-library.patch 18 Jun 2010 07:41:47 -0000 1.1
+++ couchdb0.11.0-0007-Remove-bundled-ibrowse-library.patch 13 Jul 2010 08:23:55 -0000 1.2
@@ -1,7 +1,7 @@
-From 23b1d23b0e5e206d3024f76b495f9f861979aa82 Mon Sep 17 00:00:00 2001
+From 8dccc2325740f24f6756fbda8df943aa6e29c2e6 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue, 8 Jun 2010 16:38:10 +0400
-Subject: [PATCH 7/8] Remove bundled ibrowse library
+Subject: [PATCH 7/9] Remove bundled ibrowse library
---
configure | 3 -
@@ -4082,5 +4082,5 @@ index 948958c..2650fbb 100644
code:add_pathz(filename:join([builddir(), "src", Name]))
end, Paths).
--
-1.6.6.1
+1.7.1.1
couchdb0.11.0-0008-Workaround-for-system-wide-ibrowse.patch:
couch_rep_changes_feed.erl | 2 +-
couch_rep_httpc.erl | 6 +++---
couch_rep_reader.erl | 3 +--
3 files changed, 5 insertions(+), 6 deletions(-)
Index: couchdb0.11.0-0008-Workaround-for-system-wide-ibrowse.patch
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/devel/couchdb0.11.0-0008-Workaround-for-system-wide-ibrowse.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- couchdb0.11.0-0008-Workaround-for-system-wide-ibrowse.patch 18 Jun 2010 07:41:48 -0000 1.1
+++ couchdb0.11.0-0008-Workaround-for-system-wide-ibrowse.patch 13 Jul 2010 08:23:56 -0000 1.2
@@ -1,7 +1,7 @@
-From 1d8ceb81618b65872f33c3cfa551df4499017df5 Mon Sep 17 00:00:00 2001
+From ac5d2eab946b3ab4ca7f487f621f3f4fda70b30a Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue, 8 Jun 2010 17:30:49 +0400
-Subject: [PATCH 8/8] Workaround for system-wide ibrowse
+Subject: [PATCH 8/9] Workaround for system-wide ibrowse
---
src/couchdb/couch_rep_changes_feed.erl | 2 +-
@@ -64,5 +64,5 @@ index 4f03008..42a7290 100644
-record (state, {
parent,
--
-1.6.6.1
+1.7.1.1
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/devel/import.log,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- import.log 18 Jun 2010 07:41:48 -0000 1.19
+++ import.log 13 Jul 2010 08:23:56 -0000 1.20
@@ -17,3 +17,4 @@ couchdb-0_10_2-10_fc12:HEAD:couchdb-0.10
couchdb-0_10_2-11_fc12:HEAD:couchdb-0.10.2-11.fc12.src.rpm:1276578736
couchdb-0_10_2-12_fc12:HEAD:couchdb-0.10.2-12.fc12.src.rpm:1276624368
couchdb-0_11_0-1_fc12:HEAD:couchdb-0.11.0-1.fc12.src.rpm:1276846826
+couchdb-0_11_0-3_fc12:HEAD:couchdb-0.11.0-3.fc12.src.rpm:1279009389
- Previous message: rpms/xbean/devel import.log, NONE, 1.1 pom-3.7.patch, NONE, 1.1 xbean.depmap, NONE, 1.1 xbean.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: File maven-shade-plugin-1.3.3.tar.xz uploaded to lookaside cache by sochotni
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list