[couchdb/el5: 5/5] Merge branch 'f16' into el5

[Peter Lemenkov]

commit bf67003543f4033f89f4937bd13f2ebb7f99168b
Merge: 691b664 1419f6c
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sun Mar 11 17:06:20 2012 +0400

    Merge branch 'f16' into el5

 .gitignore                                         |    2 +
 ...-doc-files-and-do-not-install-installatio.patch |    4 +-
 ...002-Install-docs-into-versioned-directory.patch |    4 +-
 ...ories-to-search-for-place-for-init-script.patch |    4 +-
 ...db-0004-Install-into-erllibdir-by-default.patch |    4 +-
 ...undled-etap-erlang-oauth-ibrowse-and-moch.patch |    8 +-
 couchdb-0006-Fixes-for-system-wide-ibrowse.patch   |   24 ++++-
 couchdb-0007-Remove-pid-file-after-stop.patch      |    4 +-
 ...DB-while-it-was-being-opened-would-crash-.patch |    4 +-
 couchdb-0009-Change-respawn-timeout-to-0.patch     |    4 +-
 ...0-Relax-curl-dependency-to-7.15-for-RHEL5.patch |    4 +-
 ... => couchdb-0011-Spidermonkey-1.8.5-patch.patch |   87 ++++++++--------
 ...fix-error-when-restarting-replications-in.patch |    8 +-
 couchdb-0013-Fix-for-ibrowse-2.2.0.patch           |   28 -----
 couchdb-0013-Use-pkg-config.patch                  |  107 ++++++++++++++++++++
 couchdb-0014-Fix-for-js-1.8.5.patch                |   92 -----------------
 couchdb.spec                                       |   23 +++--
 sources                                            |    2 +-
 18 files changed, 209 insertions(+), 204 deletions(-)
---