[couchdb] Ver. 1.1.1
Peter Lemenkov
peter at fedoraproject.org
Sun Mar 11 19:25:27 UTC 2012
commit ded6933c199372e8d61f27d8648f190947f0b093
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun Mar 11 23:18:49 2012 +0400
Ver. 1.1.1
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
.gitignore | 1 +
...-doc-files-and-do-not-install-installatio.patch | 8 +-
...002-Install-docs-into-versioned-directory.patch | 10 +-
...ories-to-search-for-place-for-init-script.patch | 10 +-
...db-0004-Install-into-erllibdir-by-default.patch | 12 +-
...undled-etap-erlang-oauth-ibrowse-and-moch.patch | 14 +-
couchdb-0006-Fixes-for-system-wide-ibrowse.patch | 44 +-
couchdb-0007-Remove-pid-file-after-stop.patch | 6 +-
... couchdb-0008-Change-respawn-timeout-to-0.patch | 6 +-
...DB-while-it-was-being-opened-would-crash-.patch | 27 -
...fix-error-when-restarting-replications-in.patch | 10 +-
...0-Relax-curl-dependency-to-7.15-for-RHEL5.patch | 73 -
couchdb-0011-Spidermonkey-1.8.5-patch.patch | 465 -
couchdb-0013-Use-pkg-config.patch | 107 -
couchdb-9999-Autoreconf.patch |20916 --------------------
couchdb.spec | 44 +-
sources | 2 +-
17 files changed, 81 insertions(+), 21674 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3f136bd..72494ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ apache-couchdb-1.0.1.tar.gz
/apache-couchdb-1.0.2.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
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 3b1d050..5a2dbc4 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,7 +1,7 @@
-From 732f47725cb66c1396944d28d541cf42052d3eb6 Mon Sep 17 00:00:00 2001
+From 89b7784e0a1101207d5ecf8b3c90c03ce7c8d42f 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 01/13] Do not gzip doc-files and do not install installation
+Subject: [PATCH 1/9] Do not gzip doc-files and do not install installation
instructions
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
@@ -10,7 +10,7 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
1 files changed, 9 insertions(+), 48 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index 6530287..dc4b8ce 100644
+index 2d0bbbe..14d57e9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,18 +15,15 @@ SUBDIRS = bin etc src share test var utils
@@ -85,5 +85,5 @@ index 6530287..dc4b8ce 100644
$(top_builddir)/test/etap/run
--
-1.7.6
+1.7.8.3
diff --git a/couchdb-0002-Install-docs-into-versioned-directory.patch b/couchdb-0002-Install-docs-into-versioned-directory.patch
index 19aa3ca..c3bd7cb 100644
--- a/couchdb-0002-Install-docs-into-versioned-directory.patch
+++ b/couchdb-0002-Install-docs-into-versioned-directory.patch
@@ -1,7 +1,7 @@
-From 6f653c94b17f1ce3142afa66983fc7856ccae3b0 Mon Sep 17 00:00:00 2001
+From f90cb082d93b46ffc1a12564c19dd060da01f21e 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 02/13] Install docs into versioned directory
+Subject: [PATCH 2/9] Install docs into versioned directory
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -9,10 +9,10 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
-index c609a08..999f890 100644
+index 6a5d865..545d402 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -356,7 +356,7 @@ AC_SUBST([bug_uri], ["LOCAL_BUG_URI"])
+@@ -402,7 +402,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 c609a08..999f890 100644
AC_SUBST([localstatelibdir], [${localstatedir}/lib/${package_identifier}])
AC_SUBST([localstatelogdir], [${localstatedir}/log/${package_identifier}])
--
-1.7.6
+1.7.8.3
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 4c9ba71..4482007 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,7 +1,7 @@
-From eaea8b05d2f22574939fe977e66d46773c33abae Mon Sep 17 00:00:00 2001
+From 9176c754364969ad5a918280d679c8d112663ddf 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 03/13] More directories to search for place for init-script
+Subject: [PATCH 3/9] More directories to search for place for init-script
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -9,10 +9,10 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 999f890..4ac64f9 100644
+index 545d402..421442a 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -294,17 +294,23 @@ launchd_enabled=false
+@@ -340,17 +340,23 @@ launchd_enabled=false
if test "$use_init" = "yes"; then
AC_MSG_CHECKING(location of init directory)
@@ -42,5 +42,5 @@ index 999f890..4ac64f9 100644
fi
fi
--
-1.7.6
+1.7.8.3
diff --git a/couchdb-0004-Install-into-erllibdir-by-default.patch b/couchdb-0004-Install-into-erllibdir-by-default.patch
index f8c63c7..469271e 100644
--- a/couchdb-0004-Install-into-erllibdir-by-default.patch
+++ b/couchdb-0004-Install-into-erllibdir-by-default.patch
@@ -1,7 +1,7 @@
-From da5d0c458c6b13db4800be3096b589ae32f384ff Mon Sep 17 00:00:00 2001
+From 2422757e3a12d7b8ce45f4433174e15e0ed8fe63 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 04/13] Install into erllibdir by default
+Subject: [PATCH 4/9] Install into erllibdir by default
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -9,10 +9,10 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 4ac64f9..248bff7 100644
+index 421442a..07e27ff 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -363,7 +363,7 @@ AC_SUBST([bug_uri], ["LOCAL_BUG_URI"])
+@@ -409,7 +409,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 4ac64f9..248bff7 100644
AC_SUBST([localstatelibdir], [${localstatedir}/lib/${package_identifier}])
AC_SUBST([localstatelogdir], [${localstatedir}/log/${package_identifier}])
AC_SUBST([localstaterundir], [${localstatedir}/run/${package_identifier}])
-@@ -373,7 +373,7 @@ if test x${IS_WINDOWS} = xTRUE; then
+@@ -419,7 +419,7 @@ if test x${IS_WINDOWS} = xTRUE; then
AC_SUBST([locallibbindir], [${prefix}/bin])
AC_SUBST([localerlanglibdir], [${libdir}])
else
@@ -31,5 +31,5 @@ index 4ac64f9..248bff7 100644
fi
--
-1.7.6
+1.7.8.3
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 0c29b90..450f07c 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,7 +1,7 @@
-From b139293116bc7d9104f89f9e2de7da1c0b121676 Mon Sep 17 00:00:00 2001
+From bc8f16336c1ed96cec2dcf5b5c4e3b26ba3bbe04 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 05/13] Don't use bundled etap, erlang-oauth, ibrowse and
+Subject: [PATCH 5/9] Don't use bundled etap, erlang-oauth, ibrowse and
mochiweb
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
@@ -12,10 +12,10 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 248bff7..9c10cf7 100644
+index 07e27ff..d431d69 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -404,10 +404,6 @@ AC_CONFIG_FILES([src/Makefile])
+@@ -449,10 +449,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])
@@ -37,10 +37,10 @@ index b9529f9..753b177 100644
-SUBDIRS = couchdb erlang-oauth etap ibrowse mochiweb
+SUBDIRS = couchdb
diff --git a/test/etap/test_util.erl.in b/test/etap/test_util.erl.in
-index 460b029..b013d50 100644
+index b986ff3..829b226 100644
--- a/test/etap/test_util.erl.in
+++ b/test/etap/test_util.erl.in
-@@ -22,7 +22,7 @@ builddir() ->
+@@ -23,7 +23,7 @@ builddir() ->
"@abs_top_builddir@".
init_code_path() ->
@@ -50,5 +50,5 @@ index 460b029..b013d50 100644
code:add_patha(filename:join([builddir(), "src", Name]))
end, Paths).
--
-1.7.6
+1.7.8.3
diff --git a/couchdb-0006-Fixes-for-system-wide-ibrowse.patch b/couchdb-0006-Fixes-for-system-wide-ibrowse.patch
index 9b5f0d1..69b00c2 100644
--- a/couchdb-0006-Fixes-for-system-wide-ibrowse.patch
+++ b/couchdb-0006-Fixes-for-system-wide-ibrowse.patch
@@ -1,34 +1,48 @@
-From cd1260d2b1fd19a5f751226c62594694c71f1062 Mon Sep 17 00:00:00 2001
+From 24f68c987b2fadf0ec1001e0783d017cb130591e 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 06/13] Fixes for system-wide ibrowse
+Subject: [PATCH 6/9] Fixes for system-wide ibrowse
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
+ 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 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+diff --git a/src/couchdb/couch_httpd_proxy.erl b/src/couchdb/couch_httpd_proxy.erl
+index 65e3e43..c196f72 100644
+--- a/src/couchdb/couch_httpd_proxy.erl
++++ b/src/couchdb/couch_httpd_proxy.erl
+@@ -14,7 +14,7 @@
+ -export([handle_proxy_req/2]).
+
+ -include("couch_db.hrl").
+--include("../ibrowse/ibrowse.hrl").
++-include_lib("ibrowse/include/ibrowse.hrl").
+
+ -define(TIMEOUT, infinity).
+ -define(PKT_SIZE, 4096).
diff --git a/src/couchdb/couch_rep.erl b/src/couchdb/couch_rep.erl
-index 47e22e9..c681425 100644
+index 9d90fee..20b2602 100644
--- a/src/couchdb/couch_rep.erl
+++ b/src/couchdb/couch_rep.erl
-@@ -18,7 +18,7 @@
- -export([replicate/2, checkpoint/1]).
+@@ -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").
- -record(state, {
- changes_feed,
+ -define(REP_ID_VERSION, 2).
+
diff --git a/src/couchdb/couch_rep_changes_feed.erl b/src/couchdb/couch_rep_changes_feed.erl
-index 2339c2f..496ccf3 100644
+index 636d5a0..7a9573d 100644
--- a/src/couchdb/couch_rep_changes_feed.erl
+++ b/src/couchdb/couch_rep_changes_feed.erl
-@@ -20,7 +20,7 @@
- -define(BUFFER_SIZE, 1000).
+@@ -21,7 +21,7 @@
+ -define(DOC_IDS_FILTER_NAME, "_doc_ids").
-include("couch_db.hrl").
--include("../ibrowse/ibrowse.hrl").
@@ -37,7 +51,7 @@ index 2339c2f..496ccf3 100644
-record (state, {
changes_from = nil,
diff --git a/src/couchdb/couch_rep_httpc.erl b/src/couchdb/couch_rep_httpc.erl
-index 783ee96..5609289 100644
+index bbe390a..acb6029 100644
--- a/src/couchdb/couch_rep_httpc.erl
+++ b/src/couchdb/couch_rep_httpc.erl
@@ -12,7 +12,7 @@
@@ -47,8 +61,8 @@ index 783ee96..5609289 100644
--include("../ibrowse/ibrowse.hrl").
+-include_lib("ibrowse/include/ibrowse.hrl").
- -export([db_exists/1, db_exists/2, full_url/1, request/1, redirected_request/2,
- redirect_url/2, spawn_worker_process/1, spawn_link_worker_process/1]).
+ -export([db_exists/1, db_exists/2]).
+ -export([full_url/1, request/1, redirected_request/3]).
--
-1.7.6
+1.7.8.3
diff --git a/couchdb-0007-Remove-pid-file-after-stop.patch b/couchdb-0007-Remove-pid-file-after-stop.patch
index 90aa6ed..a8dfaf4 100644
--- a/couchdb-0007-Remove-pid-file-after-stop.patch
+++ b/couchdb-0007-Remove-pid-file-after-stop.patch
@@ -1,7 +1,7 @@
-From c8d6f1ce43cfb4f4f66b1493d3f647e9e156e189 Mon Sep 17 00:00:00 2001
+From 5df1127d75c28d0b9e6c5eb2263d9f6106e7511a 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 07/13] Remove pid-file after stop
+Subject: [PATCH 7/9] Remove pid-file after stop
---
bin/couchdb.tpl.in | 4 +---
@@ -24,5 +24,5 @@ index 94d4743..af5cb01 100644
if kill -1 $PID 2> /dev/null; then
if test "$1" = "false"; then
--
-1.7.6
+1.7.8.3
diff --git a/couchdb-0009-Change-respawn-timeout-to-0.patch b/couchdb-0008-Change-respawn-timeout-to-0.patch
similarity index 81%
rename from couchdb-0009-Change-respawn-timeout-to-0.patch
rename to couchdb-0008-Change-respawn-timeout-to-0.patch
index bb9d1f7..c15bee0 100644
--- a/couchdb-0009-Change-respawn-timeout-to-0.patch
+++ b/couchdb-0008-Change-respawn-timeout-to-0.patch
@@ -1,7 +1,7 @@
-From e6e44926388094d11d4190de4061e02e7c7642d6 Mon Sep 17 00:00:00 2001
+From dfdf0653f4e6a4047761e66d6181c51400c842db 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 09/13] Change respawn timeout to 0.
+Subject: [PATCH 8/9] Change respawn timeout to 0.
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -20,5 +20,5 @@ index c2a3f2a..f589c0a 100644
+COUCHDB_RESPAWN_TIMEOUT=0
COUCHDB_OPTIONS=
--
-1.7.6
+1.7.8.3
diff --git a/couchdb-0012-Replicator-fix-error-when-restarting-replications-in.patch b/couchdb-0009-Replicator-fix-error-when-restarting-replications-in.patch
similarity index 85%
rename from couchdb-0012-Replicator-fix-error-when-restarting-replications-in.patch
rename to couchdb-0009-Replicator-fix-error-when-restarting-replications-in.patch
index efba7c8..ab768c4 100644
--- a/couchdb-0012-Replicator-fix-error-when-restarting-replications-in.patch
+++ b/couchdb-0009-Replicator-fix-error-when-restarting-replications-in.patch
@@ -1,7 +1,7 @@
-From 032a4e3b167a1dab3d932d9d6713e63709f5ec28 Mon Sep 17 00:00:00 2001
+From c010f25422b7dcbaf712b7617e71ffc9933e5d7f Mon Sep 17 00:00:00 2001
From: Filipe David Borba Manana <fdmanana at apache.org>
Date: Mon, 28 Mar 2011 11:08:58 +0000
-Subject: [PATCH 12/13] Replicator: fix error when restarting replications in
+Subject: [PATCH 9/9] Replicator: fix error when restarting replications in
OTP R14B02
This is a workaround for a change introduced in OTP R14B02 to the supervisor
@@ -15,10 +15,10 @@ git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1086185 13f79535-47bb
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/couchdb/couch_rep.erl b/src/couchdb/couch_rep.erl
-index c681425..1b8a23a 100644
+index 20b2602..764606f 100644
--- a/src/couchdb/couch_rep.erl
+++ b/src/couchdb/couch_rep.erl
-@@ -324,6 +324,13 @@ start_replication_server(Replicator) ->
+@@ -311,6 +311,13 @@ start_replication_server(Replicator) ->
supervisor:start_child(couch_rep_sup, Replicator),
?LOG_DEBUG("replication ~p already running at ~p", [RepId, Pid]),
Pid;
@@ -33,5 +33,5 @@ index c681425..1b8a23a 100644
throw({db_not_found, <<"could not open ", DbUrl/binary>>});
{error, {unauthorized, DbUrl}} ->
--
-1.7.6
+1.7.8.3
diff --git a/couchdb.spec b/couchdb.spec
index f58cadc..dfb183f 100644
--- a/couchdb.spec
+++ b/couchdb.spec
@@ -3,8 +3,8 @@
%define couchdb_home %{_localstatedir}/lib/couchdb
Name: couchdb
-Version: 1.0.3
-Release: 6%{?dist}
+Version: 1.1.1
+Release: 1%{?dist}
Summary: A document database server, accessible via a RESTful JSON API
Group: Applications/Databases
@@ -20,13 +20,8 @@ Patch4: couchdb-0004-Install-into-erllibdir-by-default.patch
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-deleting-a-DB-while-it-was-being-opened-would-crash-.patch
-Patch9: couchdb-0009-Change-respawn-timeout-to-0.patch
-Patch10: couchdb-0010-Relax-curl-dependency-to-7.15-for-RHEL5.patch
-Patch11: couchdb-0011-Spidermonkey-1.8.5-patch.patch
-Patch12: couchdb-0012-Replicator-fix-error-when-restarting-replications-in.patch
-Patch13: couchdb-0013-Use-pkg-config.patch
-Patch99: couchdb-9999-Autoreconf.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)
@@ -34,8 +29,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
-BuildRequires: curl-devel
-BuildRequires: erlang-erts
+BuildRequires: curl-devel >= 7.18.0
+Requires: erlang-erts >= R13B
BuildRequires: erlang-etap
BuildRequires: erlang-ibrowse >= 2.2.0
BuildRequires: erlang-mochiweb
@@ -47,7 +42,7 @@ BuildRequires: libicu-devel
BuildRequires: perl(Test::Harness)
Requires: erlang-crypto
-Requires: erlang-erts
+Requires: erlang-erts >= R13B
Requires: erlang-ibrowse >= 2.2.0
Requires: erlang-inets
Requires: erlang-kernel
@@ -89,18 +84,8 @@ JavaScript acting as the default view definition language.
%patch5 -p1 -b .remove_bundled_libs
%patch6 -p1 -b .workaround_for_system_wide_ibrowse
%patch7 -p1 -b .remove_pid_file
-%patch8 -p1 -b .fix_crash
-%patch9 -p1 -b .fix_respawn
-%if 0%{?el5}
-# Old CURL library
-%patch10 -p1 -b .curl_7_15
-%endif
-%if 0%{?fc15}%{?fc16}%{?fc17}%{?fc18}
-# JS 1.8.5
-%patch11 -p1 -b .to_new_js
-%endif
-%patch12 -p1 -b .fix_R14B02
-#%patch13 -p1 -b .pkgconfig
+%patch8 -p1 -b .fix_respawn
+%patch9 -p1 -b .fix_R14B02
# Remove bundled libraries
rm -rf src/erlang-oauth
@@ -108,17 +93,9 @@ rm -rf src/etap
rm -rf src/ibrowse
rm -rf src/mochiweb
-%if 0%{?el5}
-# ugly hack to overcome limitations of outdated autotools in EL-5
-%patch99 -p1 -b .autoreconf
-%endif
%build
-%if 0%{?el5}
-echo "no need to reconfigure on EL-5, see patch 99"
-%else
autoreconf -ivf
-%endif
%configure
make %{?_smp_mflags}
@@ -241,6 +218,9 @@ fi
%changelog
+* Sun Mar 11 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.1.1-1
+- Ver. 1.1.1
+
* Sun Mar 11 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.0.3-6
- Fix building on f18
diff --git a/sources b/sources
index b4795b1..f651f77 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cfdc2ab751bf18049c5ef7866602d8ed apache-couchdb-1.0.3.tar.gz
+cd126219b9cb69a4c521abd6960807a6 apache-couchdb-1.1.1.tar.gz
More information about the scm-commits
mailing list