[couchdb] Ver. 1.2.0
Peter Lemenkov
peter at fedoraproject.org
Mon Sep 24 10:12:48 UTC 2012
commit 4ee01f746e3f00b7317ef87d12ac2f70da56fcb5
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Mon Sep 24 14:12:13 2012 +0400
Ver. 1.2.0
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
.gitignore | 1 +
...-doc-files-and-do-not-install-installatio.patch | 12 +-
...002-Install-docs-into-versioned-directory.patch | 14 +-
...ories-to-search-for-place-for-init-script.patch | 14 +-
...db-0004-Install-into-erllibdir-by-default.patch | 16 ++--
...undled-etap-erlang-oauth-ibrowse-and-moch.patch | 117 ++++++++++++++++---
couchdb-0006-Fixes-for-system-wide-ibrowse.patch | 77 ++++++-------
couchdb-0007-Remove-pid-file-after-stop.patch | 14 +-
couchdb-0008-Change-respawn-timeout-to-0.patch | 10 +-
...fix-error-when-restarting-replications-in.patch | 37 ------
couchdb.spec | 42 ++++---
sources | 2 +-
12 files changed, 199 insertions(+), 157 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 72494ec..e30a56f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ apache-couchdb-1.0.1.tar.gz
/apache-couchdb-1.0.3-0-ga5f5eab.tar.gz
/apache-couchdb-1.0.3.tar.gz
/apache-couchdb-1.1.1.tar.gz
+/apache-couchdb-1.2.0.tar.gz
diff --git a/couchdb-0001-Do-not-gzip-doc-files-and-do-not-install-installatio.patch b/couchdb-0001-Do-not-gzip-doc-files-and-do-not-install-installatio.patch
index 5a2dbc4..64c6087 100644
--- a/couchdb-0001-Do-not-gzip-doc-files-and-do-not-install-installatio.patch
+++ b/couchdb-0001-Do-not-gzip-doc-files-and-do-not-install-installatio.patch
@@ -1,16 +1,16 @@
-From 89b7784e0a1101207d5ecf8b3c90c03ce7c8d42f Mon Sep 17 00:00:00 2001
+From 26945e3a6461687675d2d820d567f287cacdf07e Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun, 13 Feb 2011 13:52:38 +0300
-Subject: [PATCH 1/9] Do not gzip doc-files and do not install installation
+Subject: [PATCH 1/8] Do not gzip doc-files and do not install installation
instructions
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
- Makefile.am | 57 +++++++++------------------------------------------------
- 1 files changed, 9 insertions(+), 48 deletions(-)
+ Makefile.am | 57 +++++++++------------------------------------------------
+ 1 file changed, 9 insertions(+), 48 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index 2d0bbbe..14d57e9 100644
+index 8e16baf..30f5264 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,18 +15,15 @@ SUBDIRS = bin etc src share test var utils
@@ -85,5 +85,5 @@ index 2d0bbbe..14d57e9 100644
$(top_builddir)/test/etap/run
--
-1.7.8.3
+1.7.12
diff --git a/couchdb-0002-Install-docs-into-versioned-directory.patch b/couchdb-0002-Install-docs-into-versioned-directory.patch
index c3bd7cb..e53b9bb 100644
--- a/couchdb-0002-Install-docs-into-versioned-directory.patch
+++ b/couchdb-0002-Install-docs-into-versioned-directory.patch
@@ -1,18 +1,18 @@
-From f90cb082d93b46ffc1a12564c19dd060da01f21e Mon Sep 17 00:00:00 2001
+From 55b670b38c192fed43d3bfeeefcaaea748e3d5bc Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun, 13 Feb 2011 14:06:12 +0300
-Subject: [PATCH 2/9] Install docs into versioned directory
+Subject: [PATCH 2/8] Install docs into versioned directory
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
- configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index 6a5d865..545d402 100644
+index de212ec..a2ab2ae 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -402,7 +402,7 @@ AC_SUBST([bug_uri], ["LOCAL_BUG_URI"])
+@@ -551,7 +551,7 @@ AC_SUBST([bug_uri], ["LOCAL_BUG_URI"])
AC_SUBST([localconfdir], [${sysconfdir}/${package_identifier}])
AC_SUBST([localdatadir], [${datadir}/${package_identifier}])
@@ -22,5 +22,5 @@ index 6a5d865..545d402 100644
AC_SUBST([localstatelibdir], [${localstatedir}/lib/${package_identifier}])
AC_SUBST([localstatelogdir], [${localstatedir}/log/${package_identifier}])
--
-1.7.8.3
+1.7.12
diff --git a/couchdb-0003-More-directories-to-search-for-place-for-init-script.patch b/couchdb-0003-More-directories-to-search-for-place-for-init-script.patch
index 4482007..518b37e 100644
--- a/couchdb-0003-More-directories-to-search-for-place-for-init-script.patch
+++ b/couchdb-0003-More-directories-to-search-for-place-for-init-script.patch
@@ -1,18 +1,18 @@
-From 9176c754364969ad5a918280d679c8d112663ddf Mon Sep 17 00:00:00 2001
+From 9935dc52cee8f15c018c006725739e8f4b97761d Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun, 13 Feb 2011 14:21:20 +0300
-Subject: [PATCH 3/9] More directories to search for place for init-script
+Subject: [PATCH 3/8] More directories to search for place for init-script
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
- configure.ac | 16 +++++++++++-----
- 1 files changed, 11 insertions(+), 5 deletions(-)
+ configure.ac | 16 +++++++++++-----
+ 1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 545d402..421442a 100644
+index a2ab2ae..f023e51 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -340,17 +340,23 @@ launchd_enabled=false
+@@ -487,17 +487,23 @@ launchd_enabled=false
if test "$use_init" = "yes"; then
AC_MSG_CHECKING(location of init directory)
@@ -42,5 +42,5 @@ index 545d402..421442a 100644
fi
fi
--
-1.7.8.3
+1.7.12
diff --git a/couchdb-0004-Install-into-erllibdir-by-default.patch b/couchdb-0004-Install-into-erllibdir-by-default.patch
index 469271e..2998ac5 100644
--- a/couchdb-0004-Install-into-erllibdir-by-default.patch
+++ b/couchdb-0004-Install-into-erllibdir-by-default.patch
@@ -1,18 +1,18 @@
-From 2422757e3a12d7b8ce45f4433174e15e0ed8fe63 Mon Sep 17 00:00:00 2001
+From 17e5c7496c5915fb0f15f12e2afd49c1579a7061 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun, 13 Feb 2011 14:36:36 +0300
-Subject: [PATCH 4/9] Install into erllibdir by default
+Subject: [PATCH 4/8] Install into erllibdir by default
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
- configure.ac | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 421442a..07e27ff 100644
+index f023e51..5ce0e96 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -409,7 +409,7 @@ AC_SUBST([bug_uri], ["LOCAL_BUG_URI"])
+@@ -558,7 +558,7 @@ AC_SUBST([bug_uri], ["LOCAL_BUG_URI"])
AC_SUBST([localconfdir], [${sysconfdir}/${package_identifier}])
AC_SUBST([localdatadir], [${datadir}/${package_identifier}])
AC_SUBST([localdocdir], [${datadir}/doc/${package_identifier}-${version}])
@@ -21,7 +21,7 @@ index 421442a..07e27ff 100644
AC_SUBST([localstatelibdir], [${localstatedir}/lib/${package_identifier}])
AC_SUBST([localstatelogdir], [${localstatedir}/log/${package_identifier}])
AC_SUBST([localstaterundir], [${localstatedir}/run/${package_identifier}])
-@@ -419,7 +419,7 @@ if test x${IS_WINDOWS} = xTRUE; then
+@@ -568,7 +568,7 @@ if test x${IS_WINDOWS} = xTRUE; then
AC_SUBST([locallibbindir], [${prefix}/bin])
AC_SUBST([localerlanglibdir], [${libdir}])
else
@@ -31,5 +31,5 @@ index 421442a..07e27ff 100644
fi
--
-1.7.8.3
+1.7.12
diff --git a/couchdb-0005-Don-t-use-bundled-etap-erlang-oauth-ibrowse-and-moch.patch b/couchdb-0005-Don-t-use-bundled-etap-erlang-oauth-ibrowse-and-moch.patch
index 450f07c..e21acbc 100644
--- a/couchdb-0005-Don-t-use-bundled-etap-erlang-oauth-ibrowse-and-moch.patch
+++ b/couchdb-0005-Don-t-use-bundled-etap-erlang-oauth-ibrowse-and-moch.patch
@@ -1,21 +1,32 @@
-From bc8f16336c1ed96cec2dcf5b5c4e3b26ba3bbe04 Mon Sep 17 00:00:00 2001
+From 535710a2c8723f3bb598a754ae60490724d70eec Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun, 15 May 2011 18:47:41 +0400
-Subject: [PATCH 5/9] Don't use bundled etap, erlang-oauth, ibrowse and
+Subject: [PATCH 5/8] Don't use bundled etap, erlang-oauth, ibrowse and
mochiweb
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
- configure.ac | 4 ----
- src/Makefile.am | 2 +-
- test/etap/test_util.erl.in | 2 +-
- 3 files changed, 2 insertions(+), 6 deletions(-)
+ configure.ac | 6 +-----
+ src/Makefile.am | 2 +-
+ src/couchdb/priv/couch_js/http.c | 14 --------------
+ src/ejson/Makefile.am | 8 ++------
+ test/etap/test_util.erl.in | 2 +-
+ 5 files changed, 5 insertions(+), 27 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 07e27ff..d431d69 100644
+index 5ce0e96..f411bbf 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -449,10 +449,6 @@ AC_CONFIG_FILES([src/Makefile])
+@@ -389,7 +389,7 @@ AC_ARG_WITH([win32-curl], [AC_HELP_STRING([--with-win32-curl=PATH],
+ # OpenSSL libraries may be pulled in via libcurl if it was built with SSL
+ # these are libeay32 ssleay32 instead of crypto ssl on unix
+ ], [
+- AC_CHECK_CURL([7.18.0],
++ AC_CHECK_CURL([7.15.0],
+ [AC_DEFINE([HAVE_CURL], [1], ["Provide HTTP support to couchjs"])], [
+ AC_MSG_WARN([You will be unable to run some JavaScript unit tests.])
+ use_curl=no
+@@ -599,10 +599,6 @@ AC_CONFIG_FILES([src/Makefile])
AC_CONFIG_FILES([src/couchdb/couch.app.tpl])
AC_CONFIG_FILES([src/couchdb/Makefile])
AC_CONFIG_FILES([src/couchdb/priv/Makefile])
@@ -23,32 +34,100 @@ index 07e27ff..d431d69 100644
-AC_CONFIG_FILES([src/etap/Makefile])
-AC_CONFIG_FILES([src/ibrowse/Makefile])
-AC_CONFIG_FILES([src/mochiweb/Makefile])
- AC_CONFIG_FILES([test/Makefile])
- AC_CONFIG_FILES([test/bench/Makefile])
- AC_CONFIG_FILES([test/etap/Makefile])
+ AC_CONFIG_FILES([src/snappy/Makefile])
+ AC_CONFIG_FILES([src/snappy/google-snappy/snappy-stubs-public.h])
+ AC_CONFIG_FILES([src/ejson/Makefile])
diff --git a/src/Makefile.am b/src/Makefile.am
-index b9529f9..753b177 100644
+index 047f1ee..457640c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,4 +10,4 @@
## License for the specific language governing permissions and limitations under
## the License.
--SUBDIRS = couchdb erlang-oauth etap ibrowse mochiweb
-+SUBDIRS = couchdb
+-SUBDIRS = couchdb ejson erlang-oauth etap ibrowse mochiweb snappy
++SUBDIRS = couchdb ejson snappy
+diff --git a/src/couchdb/priv/couch_js/http.c b/src/couchdb/priv/couch_js/http.c
+index 0685abb..307b291 100644
+--- a/src/couchdb/priv/couch_js/http.c
++++ b/src/couchdb/priv/couch_js/http.c
+@@ -364,7 +364,6 @@ CURL* HTTP_HANDLE = NULL;
+ char ERRBUF[CURL_ERROR_SIZE];
+
+ static size_t send_body(void *ptr, size_t size, size_t nmem, void *data);
+-static int seek_body(void *ptr, curl_off_t offset, int origin);
+ static size_t recv_body(void *ptr, size_t size, size_t nmem, void *data);
+ static size_t recv_header(void *ptr, size_t size, size_t nmem, void *data);
+
+@@ -391,8 +390,6 @@ go(JSContext* cx, JSObject* obj, HTTPData* http, char* body, size_t bodylen)
+ if(HTTP_HANDLE == NULL) {
+ HTTP_HANDLE = curl_easy_init();
+ curl_easy_setopt(HTTP_HANDLE, CURLOPT_READFUNCTION, send_body);
+- curl_easy_setopt(HTTP_HANDLE, CURLOPT_SEEKFUNCTION,
+- (curl_seek_callback) seek_body);
+ curl_easy_setopt(HTTP_HANDLE, CURLOPT_HEADERFUNCTION, recv_header);
+ curl_easy_setopt(HTTP_HANDLE, CURLOPT_WRITEFUNCTION, recv_body);
+ curl_easy_setopt(HTTP_HANDLE, CURLOPT_NOPROGRESS, 1);
+@@ -437,7 +434,6 @@ go(JSContext* cx, JSObject* obj, HTTPData* http, char* body, size_t bodylen)
+ curl_easy_setopt(HTTP_HANDLE, CURLOPT_URL, http->url);
+ curl_easy_setopt(HTTP_HANDLE, CURLOPT_HTTPHEADER, http->req_headers);
+ curl_easy_setopt(HTTP_HANDLE, CURLOPT_READDATA, &state);
+- curl_easy_setopt(HTTP_HANDLE, CURLOPT_SEEKDATA, &state);
+ curl_easy_setopt(HTTP_HANDLE, CURLOPT_WRITEHEADER, &state);
+ curl_easy_setopt(HTTP_HANDLE, CURLOPT_WRITEDATA, &state);
+
+@@ -527,16 +523,6 @@ send_body(void *ptr, size_t size, size_t nmem, void *data)
+ return towrite;
+ }
+
+-static int
+-seek_body(void* ptr, curl_off_t offset, int origin)
+-{
+- CurlState* state = (CurlState*) ptr;
+- if(origin != SEEK_SET) return -1;
+-
+- state->sent = (size_t) offset;
+- return (int) state->sent;
+-}
+-
+ static size_t
+ recv_header(void *ptr, size_t size, size_t nmem, void *data)
+ {
+diff --git a/src/ejson/Makefile.am b/src/ejson/Makefile.am
+index c1e07db..6f2dfaa 100644
+--- a/src/ejson/Makefile.am
++++ b/src/ejson/Makefile.am
+@@ -44,15 +44,11 @@ EJSON_C_HDRS = \
+
+ ejson_file_collection = \
+ ejson.app.in \
+- ejson.erl \
+- mochijson2.erl \
+- mochinum.erl
++ ejson.erl
+
+ ejsonebin_make_generated_file_list = \
+ ejson.app \
+- ejson.beam \
+- mochijson2.beam \
+- mochinum.beam
++ ejson.beam
+
+ EXTRA_DIST = \
+ $(EJSON_C_HDRS) \
diff --git a/test/etap/test_util.erl.in b/test/etap/test_util.erl.in
-index b986ff3..829b226 100644
+index f17be20..759eb09 100644
--- a/test/etap/test_util.erl.in
+++ b/test/etap/test_util.erl.in
@@ -23,7 +23,7 @@ builddir() ->
"@abs_top_builddir@".
init_code_path() ->
-- Paths = ["etap", "couchdb", "erlang-oauth", "ibrowse", "mochiweb"],
-+ Paths = ["couchdb"],
+- Paths = ["etap", "couchdb", "ejson", "erlang-oauth", "ibrowse", "mochiweb",
++ Paths = ["couchdb", "ejson",
+ "snappy"],
lists:foreach(fun(Name) ->
code:add_patha(filename:join([builddir(), "src", Name]))
- end, Paths).
--
-1.7.8.3
+1.7.12
diff --git a/couchdb-0006-Fixes-for-system-wide-ibrowse.patch b/couchdb-0006-Fixes-for-system-wide-ibrowse.patch
index 69b00c2..961e948 100644
--- a/couchdb-0006-Fixes-for-system-wide-ibrowse.patch
+++ b/couchdb-0006-Fixes-for-system-wide-ibrowse.patch
@@ -1,18 +1,35 @@
-From 24f68c987b2fadf0ec1001e0783d017cb130591e Mon Sep 17 00:00:00 2001
+From 07f58574b3899c9da5f148680d67a828d943140d Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun, 13 Feb 2011 14:52:57 +0300
-Subject: [PATCH 6/9] Fixes for system-wide ibrowse
+Subject: [PATCH 6/8] Fixes for system-wide ibrowse
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+
+Conflicts:
+ src/couchdb/couch_rep.erl
+ src/couchdb/couch_rep_changes_feed.erl
+ src/couchdb/couch_rep_httpc.erl
---
- src/couchdb/couch_httpd_proxy.erl | 2 +-
- src/couchdb/couch_rep.erl | 2 +-
- src/couchdb/couch_rep_changes_feed.erl | 2 +-
- src/couchdb/couch_rep_httpc.erl | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
+ src/couchdb/couch_api_wrap_httpc.erl | 2 +-
+ src/couchdb/couch_httpd_proxy.erl | 2 +-
+ src/couchdb/couch_replicator_utils.erl | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+diff --git a/src/couchdb/couch_api_wrap_httpc.erl b/src/couchdb/couch_api_wrap_httpc.erl
+index d05eec7..0030615 100644
+--- a/src/couchdb/couch_api_wrap_httpc.erl
++++ b/src/couchdb/couch_api_wrap_httpc.erl
+@@ -14,7 +14,7 @@
+
+ -include("couch_db.hrl").
+ -include("couch_api_wrap.hrl").
+--include("../ibrowse/ibrowse.hrl").
++-include_lib("ibrowse/include/ibrowse.hrl").
+
+ -export([setup/1]).
+ -export([send_req/3]).
diff --git a/src/couchdb/couch_httpd_proxy.erl b/src/couchdb/couch_httpd_proxy.erl
-index 65e3e43..c196f72 100644
+index dec3f55..eb037b4 100644
--- a/src/couchdb/couch_httpd_proxy.erl
+++ b/src/couchdb/couch_httpd_proxy.erl
@@ -14,7 +14,7 @@
@@ -24,45 +41,19 @@ index 65e3e43..c196f72 100644
-define(TIMEOUT, infinity).
-define(PKT_SIZE, 4096).
-diff --git a/src/couchdb/couch_rep.erl b/src/couchdb/couch_rep.erl
-index 9d90fee..20b2602 100644
---- a/src/couchdb/couch_rep.erl
-+++ b/src/couchdb/couch_rep.erl
-@@ -20,7 +20,7 @@
- -export([start_replication/3, end_replication/1, get_result/4]).
-
- -include("couch_db.hrl").
---include("../ibrowse/ibrowse.hrl").
-+-include_lib("ibrowse/include/ibrowse.hrl").
-
- -define(REP_ID_VERSION, 2).
-
-diff --git a/src/couchdb/couch_rep_changes_feed.erl b/src/couchdb/couch_rep_changes_feed.erl
-index 636d5a0..7a9573d 100644
---- a/src/couchdb/couch_rep_changes_feed.erl
-+++ b/src/couchdb/couch_rep_changes_feed.erl
+diff --git a/src/couchdb/couch_replicator_utils.erl b/src/couchdb/couch_replicator_utils.erl
+index bd590ed..934e5ce 100644
+--- a/src/couchdb/couch_replicator_utils.erl
++++ b/src/couchdb/couch_replicator_utils.erl
@@ -21,7 +21,7 @@
- -define(DOC_IDS_FILTER_NAME, "_doc_ids").
-
- -include("couch_db.hrl").
---include("../ibrowse/ibrowse.hrl").
-+-include_lib("ibrowse/include/ibrowse.hrl").
-
- -record (state, {
- changes_from = nil,
-diff --git a/src/couchdb/couch_rep_httpc.erl b/src/couchdb/couch_rep_httpc.erl
-index bbe390a..acb6029 100644
---- a/src/couchdb/couch_rep_httpc.erl
-+++ b/src/couchdb/couch_rep_httpc.erl
-@@ -12,7 +12,7 @@
-
- -module(couch_rep_httpc).
-include("couch_db.hrl").
+ -include("couch_api_wrap.hrl").
+ -include("couch_replicator.hrl").
--include("../ibrowse/ibrowse.hrl").
+-include_lib("ibrowse/include/ibrowse.hrl").
- -export([db_exists/1, db_exists/2]).
- -export([full_url/1, request/1, redirected_request/3]).
+ -import(couch_util, [
+ get_value/2,
--
-1.7.8.3
+1.7.12
diff --git a/couchdb-0007-Remove-pid-file-after-stop.patch b/couchdb-0007-Remove-pid-file-after-stop.patch
index a8dfaf4..398ff58 100644
--- a/couchdb-0007-Remove-pid-file-after-stop.patch
+++ b/couchdb-0007-Remove-pid-file-after-stop.patch
@@ -1,17 +1,17 @@
-From 5df1127d75c28d0b9e6c5eb2263d9f6106e7511a Mon Sep 17 00:00:00 2001
+From 59352d9d7d4baebe3576f6f7b39b3499d102d955 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 7/9] Remove pid-file after stop
+Subject: [PATCH 7/8] Remove pid-file after stop
---
- bin/couchdb.tpl.in | 4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
+ bin/couchdb.tpl.in | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in
-index 94d4743..af5cb01 100644
+index eab27b5..d7a0482 100644
--- a/bin/couchdb.tpl.in
+++ b/bin/couchdb.tpl.in
-@@ -262,10 +262,8 @@ EOF
+@@ -267,10 +267,8 @@ EOF
stop_couchdb () {
PID=`_get_pid`
@@ -24,5 +24,5 @@ index 94d4743..af5cb01 100644
if kill -1 $PID 2> /dev/null; then
if test "$1" = "false"; then
--
-1.7.8.3
+1.7.12
diff --git a/couchdb-0008-Change-respawn-timeout-to-0.patch b/couchdb-0008-Change-respawn-timeout-to-0.patch
index c15bee0..a4f234b 100644
--- a/couchdb-0008-Change-respawn-timeout-to-0.patch
+++ b/couchdb-0008-Change-respawn-timeout-to-0.patch
@@ -1,12 +1,12 @@
-From dfdf0653f4e6a4047761e66d6181c51400c842db Mon Sep 17 00:00:00 2001
+From 8d090ff218c7c195f034dbf6f090eabbe28f6b6c Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu, 26 Aug 2010 13:22:56 +0400
-Subject: [PATCH 8/9] Change respawn timeout to 0.
+Subject: [PATCH 8/8] Change respawn timeout to 0.
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
- etc/default/couchdb | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ etc/default/couchdb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/etc/default/couchdb b/etc/default/couchdb
index c2a3f2a..f589c0a 100644
@@ -20,5 +20,5 @@ index c2a3f2a..f589c0a 100644
+COUCHDB_RESPAWN_TIMEOUT=0
COUCHDB_OPTIONS=
--
-1.7.8.3
+1.7.12
diff --git a/couchdb.spec b/couchdb.spec
index ad4bb56..10c84a3 100644
--- a/couchdb.spec
+++ b/couchdb.spec
@@ -3,14 +3,14 @@
%define couchdb_home %{_localstatedir}/lib/couchdb
Name: couchdb
-Version: 1.1.1
-Release: 4%{?dist}.1
+Version: 1.2.0
+Release: 1%{?dist}
Summary: A document database server, accessible via a RESTful JSON API
Group: Applications/Databases
License: ASL 2.0
URL: http://couchdb.apache.org/
-Source0: http://www.apache.org/dist/%{name}/%{version}/apache-%{name}-%{version}.tar.gz
+Source0: http://www.apache.org/dist/%{name}/releases/%{version}/apache-%{name}-%{version}.tar.gz
Source1: %{name}.init
Source2: %{name}.service
Source3: %{name}.tmpfiles.conf
@@ -22,7 +22,6 @@ Patch5: couchdb-0005-Don-t-use-bundled-etap-erlang-oauth-ibrowse-and-moch.patch
Patch6: couchdb-0006-Fixes-for-system-wide-ibrowse.patch
Patch7: couchdb-0007-Remove-pid-file-after-stop.patch
Patch8: couchdb-0008-Change-respawn-timeout-to-0.patch
-Patch9: couchdb-0009-Replicator-fix-error-when-restarting-replications-in.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -88,7 +87,6 @@ JavaScript acting as the default view definition language.
%patch6 -p1 -b .workaround_for_system_wide_ibrowse
%patch7 -p1 -b .remove_pid_file
%patch8 -p1 -b .fix_respawn
-%patch9 -p1 -b .fix_R14B02
# Remove bundled libraries
rm -rf src/erlang-oauth
@@ -99,37 +97,41 @@ rm -rf src/mochiweb
%build
autoreconf -ivf
-%configure
+%configure --with-erlang=%{_libdir}/erlang/usr/include
make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
# Install our custom couchdb initscript
%if 0%{?fedora} > 16
-install -D -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/%{name}.service
-rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/default/
+install -D -m 755 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service
+rm -rf %{buildroot}/%{_sysconfdir}/rc.d/
+rm -rf %{buildroot}%{_sysconfdir}/default/
%else
# Use /etc/sysconfig instead of /etc/default
-mv $RPM_BUILD_ROOT%{_sysconfdir}/{default,sysconfig}
-install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
+mv %{buildroot}%{_sysconfdir}/{default,sysconfig}
+install -D -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
%endif
# Install /etc/tmpfiles.d entry
%if 0%{?fedora} > 14
-install -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/%{name}.conf
+install -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
%endif
+# Remove *.la files
+find %{buildroot} -type f -name "*.la" -delete
+
%check
-make check || exit 1
+#make check || exit 1
+make check
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%pre
@@ -209,8 +211,11 @@ fi
%{_initrddir}/%{name}
%endif
%{_bindir}/%{name}
+%{_bindir}/couch-config
%{_bindir}/couchjs
-%{_libdir}/erlang/lib/couch-%{version}
+%{_libdir}/erlang/lib/couch-%{version}/
+%{_libdir}/erlang/lib/ejson-0.1.0/
+%{_libdir}/erlang/lib/snappy-1.0.3/
%{_datadir}/%{name}
%{_mandir}/man1/%{name}.1.*
%{_mandir}/man1/couchjs.1.*
@@ -220,6 +225,9 @@ fi
%changelog
+* Mon Sep 24 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.2.0-1
+- Ver. 1.2.0
+
* Mon Sep 24 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.1.1-4.1
- Rebuild
diff --git a/sources b/sources
index f651f77..5940d26 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cd126219b9cb69a4c521abd6960807a6 apache-couchdb-1.1.1.tar.gz
+a5cbbcaac288831b3d8a08b725657f10 apache-couchdb-1.2.0.tar.gz
More information about the scm-commits
mailing list