[couchdb/el6: 3/5] Merge branch 'f15'

[Peter Lemenkov]

commit 8cbfeebfacabeeb07a0033407f2f88b8fc70c2b4
Merge: 0a82f27 09d3653
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sat Jun 18 16:19:39 2011 +0400

    Merge branch 'f15'
    
    Conflicts:
    	couchdb.spec

 ...-doc-files-and-do-not-install-installatio.patch |    5 +-
 ...002-Install-docs-into-versioned-directory.patch |    2 +-
 ...ories-to-search-for-place-for-init-script.patch |    2 +-
 ...db-0004-Install-into-erllibdir-by-default.patch |    2 +-
 ...undled-etap-erlang-oauth-ibrowse-and-moch.patch |   54 +
 ...-0005-Remove-bundled-erlang-oauth-library.patch |  476 --
 ...ouchdb-0006-Fixes-for-system-wide-ibrowse.patch |   21 +-
 couchdb-0006-Remove-bundled-etap-library.patch     | 1393 ----
 couchdb-0007-Remove-bundled-ibrowse-library.patch  | 4110 -----------
 ...> couchdb-0007-Remove-pid-file-after-stop.patch |    6 +-
 couchdb-0008-Remove-bundled-mochiweb-library.patch | 7208 --------------------
 ...DB-while-it-was-being-opened-would-crash-.patch |    7 +-
 ... couchdb-0009-Change-respawn-timeout-to-0.patch |    6 +-
 ...0-Relax-curl-dependency-to-7.15-for-RHEL5.patch |    6 +-
 couchdb-0011-Added-Spidermonkey-1.8.5-patch.patch  |  466 ++
 ...fix-error-when-restarting-replications-in.patch |   37 +
 couchdb-0013-Fix-for-ibrowse-2.2.0.patch           |   28 +
 couchdb-0014-Fix-for-js-1.8.5.patch                |   92 +
 couchdb.spec                                       |  107 +-
 19 files changed, 772 insertions(+), 13256 deletions(-)
---
diff --cc couchdb.spec
index 6e8edf4,f680516..80a7db9
--- a/couchdb.spec
+++ b/couchdb.spec
@@@ -78,20 -79,29 +79,30 @@@ JavaScript acting as the default view d
  %patch2 -p1 -b .use_versioned_docdir
  %patch3 -p1 -b .more_init_dirs
  %patch4 -p1 -b .install_into_erldir
- %patch5 -p1 -b .remove_bundled_oauth
- %patch6 -p1 -b .remove_bundled_etap
- %patch7 -p1 -b .remove_bundled_ibrowse
- %patch8 -p1 -b .remove_bundled_mochiweb
- %patch9 -p1 -b .workaround_for_system_wide_ibrowse
- %patch10 -p1 -b .remove_pid_file
- %patch11 -p1 -b .fix_crash
- %patch12 -p1 -b .fix_respawn
+ %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}
- # Erlang/OTP R12B5
- %patch13 -p1 -b .curl_7_15
+ # Old CURL library
+ %patch10 -p1 -b .curl_7_15
+ %endif
+ %patch12 -p1 -b .fix_R14B02
+ %patch13 -p1 -b .ibrowse_2_2_0
+ # JS 1.8.5
+ %if 0%{?fc15}%{?fc16}
+ %patch11 -p1 -b .to_new_js
+ %patch14 -p1 -b .to_new_js_again
  %endif
 +%patch14 -p1 -b .to_new_js
  
+ # Remove bundled libraries
+ rm -rf src/erlang-oauth
+ rm -rf src/etap
+ rm -rf src/ibrowse
+ rm -rf src/mochiweb
+ 
  %build
  autoreconf -ivf
  %configure