Tue Jun 22 04:34:14 UTC 2010

Author: peter

Update of /cvs/pkgs/rpms/couchdb/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28361/F-12

Modified Files:
	couchdb-0001-Force-init-script-installation.patch 
	couchdb-0002-Install-into-erllibdir-by-default.patch 
	couchdb-0003-Remove-bundled-erlang-oauth-library.patch 
	couchdb-0004-Remove-bundled-erlang-etap-library.patch 
	couchdb-0005-Remove-bundled-mochiweb-library.patch 
	couchdb-0006-Remove-pid-file-after-stop.patch 
	couchdb-0007-Fix-for-system-wide-mochiweb.patch couchdb.spec 
	import.log 
Added Files:
	couchdb-0008-Remove-bundled-ibrowse-library.patch 
	couchdb-0009-Workaround-for-system-wide-ibrowse.patch 
Log Message:
Remove bundled ibrowse, narrow requires, clean up spec-file

couchdb-0008-Remove-bundled-ibrowse-library.patch:
 b/configure                              |    3 
 b/configure.ac                           |    1 
 b/src/Makefile.am                        |    2 
 b/src/Makefile.in                        |    2 
 b/src/couchdb/couch_rep_changes_feed.erl |    2 
 b/src/couchdb/couch_rep_httpc.erl        |    2 
 b/src/couchdb/couch_rep_reader.erl       |    2 
 b/test/etap/test_util.erl.in             |    3 
 src/ibrowse/Makefile.am                  |   49 -
 src/ibrowse/Makefile.in                  |  475 ---------
 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 -------
 19 files changed, 6 insertions(+), 3917 deletions(-)

--- NEW FILE couchdb-0008-Remove-bundled-ibrowse-library.patch ---
>From fd9d11d147de7727162cf53fb6187229c8181c00 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 8/9] Remove bundled ibrowse library

---
 configure                              |    3 -
 configure.ac                           |    1 -
 src/Makefile.am                        |    2 +-
 src/Makefile.in                        |    2 +-
 src/couchdb/couch_rep_changes_feed.erl |    2 +-
 src/couchdb/couch_rep_httpc.erl        |    2 +-
 src/couchdb/couch_rep_reader.erl       |    2 +-
 src/ibrowse/Makefile.am                |   49 --
 src/ibrowse/Makefile.in                |  475 ----------
 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 --------
 test/etap/test_util.erl.in             |    2 +-
 19 files changed, 6 insertions(+), 3916 deletions(-)
 delete mode 100644 src/ibrowse/Makefile.am
 delete mode 100644 src/ibrowse/Makefile.in
 delete mode 100644 src/ibrowse/ibrowse.app.in
 delete mode 100644 src/ibrowse/ibrowse.erl
 delete mode 100644 src/ibrowse/ibrowse.hrl
 delete mode 100644 src/ibrowse/ibrowse_app.erl
 delete mode 100644 src/ibrowse/ibrowse_http_client.erl
 delete mode 100644 src/ibrowse/ibrowse_lb.erl
 delete mode 100644 src/ibrowse/ibrowse_lib.erl
 delete mode 100644 src/ibrowse/ibrowse_sup.erl
 delete mode 100644 src/ibrowse/ibrowse_test.erl

diff --git a/configure b/configure
index 2d728fe..889c135 100755
--- a/configure
+++ b/configure
@@ -12137,8 +12137,6 @@ ac_config_files="$ac_config_files src/couchdb/Makefile"
 
 ac_config_files="$ac_config_files src/couchdb/priv/Makefile"
 
-ac_config_files="$ac_config_files src/ibrowse/Makefile"
-
 ac_config_files="$ac_config_files test/Makefile"
 
 ac_config_files="$ac_config_files test/etap/Makefile"
@@ -13154,7 +13152,6 @@ do
     "src/couchdb/couch.app.tpl") CONFIG_FILES="$CONFIG_FILES src/couchdb/couch.app.tpl" ;;
     "src/couchdb/Makefile") CONFIG_FILES="$CONFIG_FILES src/couchdb/Makefile" ;;
     "src/couchdb/priv/Makefile") CONFIG_FILES="$CONFIG_FILES src/couchdb/priv/Makefile" ;;
-    "src/ibrowse/Makefile") CONFIG_FILES="$CONFIG_FILES src/ibrowse/Makefile" ;;
     "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
     "test/etap/Makefile") CONFIG_FILES="$CONFIG_FILES test/etap/Makefile" ;;
     "test/etap/test_util.erl") CONFIG_FILES="$CONFIG_FILES test/etap/test_util.erl" ;;
diff --git a/configure.ac b/configure.ac
index a53df9b..b1c894a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -335,7 +335,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])
-AC_CONFIG_FILES([src/ibrowse/Makefile])
 AC_CONFIG_FILES([test/Makefile])
 AC_CONFIG_FILES([test/etap/Makefile])
 AC_CONFIG_FILES([test/etap/test_util.erl])
diff --git a/src/Makefile.am b/src/Makefile.am
index 5a6646f..753b177 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 ibrowse
+SUBDIRS = couchdb
diff --git a/src/Makefile.in b/src/Makefile.in
index d1e6ba5..8219ebf 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -239,7 +239,7 @@ version_minor = @version_minor@
 version_release = @version_release@
 version_revision = @version_revision@
 version_stage = @version_stage@
-SUBDIRS = couchdb ibrowse
+SUBDIRS = couchdb
 all: all-recursive
 
 .SUFFIXES:
diff --git a/src/couchdb/couch_rep_changes_feed.erl b/src/couchdb/couch_rep_changes_feed.erl
index 6aefd41..0f652ca 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).
 
 -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 59c3986..63783dc 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("../ibrowse/ibrowse.hrl").
+-include_lib("ibrowse/include/ibrowse.hrl").
 
 -export([db_exists/1, full_url/1, request/1, redirected_request/2,
     spawn_worker_process/1, spawn_link_worker_process/1]).
diff --git a/src/couchdb/couch_rep_reader.erl b/src/couchdb/couch_rep_reader.erl
index 7f06150..4206ba4 100644
--- a/src/couchdb/couch_rep_reader.erl
+++ b/src/couchdb/couch_rep_reader.erl
@@ -25,7 +25,7 @@
 -define (MAX_PIPELINE_SIZE, 50).
 
 -include("couch_db.hrl").
--include("../ibrowse/ibrowse.hrl").
+-include_lib("ibrowse/include/ibrowse.hrl").
 
 -record (state, {
     parent,
diff --git a/src/ibrowse/Makefile.am b/src/ibrowse/Makefile.am
deleted file mode 100644
index 510f36a..0000000
--- a/src/ibrowse/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-## Licensed under the Apache License, Version 2.0 (the "License"); you may not
-## use this file except in compliance with the License. You may obtain a copy of
-## the License at
-##
-##   http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-## WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-## License for the specific language governing permissions and limitations under
-## the License.
-
-ibrowseebindir = $(localerlanglibdir)/ibrowse-1.5.2/ebin
-
-ibrowse_file_collection = \
-	ibrowse.app.in \
-    ibrowse.erl \
-    ibrowse_app.erl \
-    ibrowse_http_client.erl \
-    ibrowse_lb.erl \
-    ibrowse_lib.erl \
-    ibrowse_sup.erl \
-    ibrowse_test.erl
-
-ibrowseebin_make_generated_file_list = \
-	ibrowse.app \
-    ibrowse.beam \
-    ibrowse_app.beam \
-    ibrowse_http_client.beam \
-    ibrowse_lb.beam \
-    ibrowse_lib.beam \
-    ibrowse_sup.beam \
-    ibrowse_test.beam
-
-ibrowseebin_DATA = \
-    $(ibrowseebin_make_generated_file_list)
-
-EXTRA_DIST =  \
-    $(ibrowse_file_collection) \
-    ibrowse.hrl
-
-CLEANFILES = \
-    $(ibrowseebin_make_generated_file_list)
-
-%.app: %.app.in
-	cp $< $@
-
-%.beam: %.erl
-	$(ERLC) $(ERLC_FLAGS) $<
diff --git a/src/ibrowse/Makefile.in b/src/ibrowse/Makefile.in
deleted file mode 100644
index 0b42325..0000000
--- a/src/ibrowse/Makefile.in
+++ /dev/null
@@ -1,475 +0,0 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
[...3722 lines suppressed...]
-		    {"http://www.google.com", get},
-		    {"http://www.google.com", options},
-		    {"http://www.sun.com", get},
-		    {"http://www.oracle.com", get},
-		    {"http://www.bbc.co.uk", get},
-		    {"http://www.bbc.co.uk", trace},
-		    {"http://www.bbc.co.uk", options},
-		    {"http://yaws.hyber.org", get},
-		    {"http://jigsaw.w3.org/HTTP/ChunkedScript", get},
-		    {"http://jigsaw.w3.org/HTTP/TE/foo.txt", get},
-		    {"http://jigsaw.w3.org/HTTP/TE/bar.txt", get},
-		    {"http://jigsaw.w3.org/HTTP/connection.html", get},
-		    {"http://jigsaw.w3.org/HTTP/cc.html", get},
-		    {"http://jigsaw.w3.org/HTTP/cc-private.html", get},
-		    {"http://jigsaw.w3.org/HTTP/cc-proxy-revalidate.html", get},
-		    {"http://jigsaw.w3.org/HTTP/cc-nocache.html", get},
-		    {"http://jigsaw.w3.org/HTTP/h-content-md5.html", get},
-		    {"http://jigsaw.w3.org/HTTP/h-retry-after.html", get},
-		    {"http://jigsaw.w3.org/HTTP/h-retry-after-date.html", get},
-		    {"http://jigsaw.w3.org/HTTP/neg", get},
-		    {"http://jigsaw.w3.org/HTTP/negbad", get},
-		    {"http://jigsaw.w3.org/HTTP/400/toolong/", get},
-		    {"http://jigsaw.w3.org/HTTP/300/", get},
-		    {"http://jigsaw.w3.org/HTTP/Basic/", get, [{basic_auth, {"guest", "guest"}}]},
-		    {"http://jigsaw.w3.org/HTTP/CL/", get},
-		    {"http://www.httpwatch.com/httpgallery/chunked/", get}
-		   ]).
-
-unit_tests() ->
-    unit_tests([]).
-
-unit_tests(Options) ->
-    Options_1 = Options ++ [{connect_timeout, 5000}],
-    {Pid, Ref} = erlang:spawn_monitor(?MODULE, unit_tests_1, [self(), Options_1]),
-    receive
-	{done, Pid} ->
-	    ok;
-	{'DOWN', Ref, _, _, Info} ->
-	    io:format("Test process crashed: ~p~n", [Info])
-    after 60000 ->
-	    exit(Pid, kill),
-	    io:format("Timed out waiting for tests to complete~n", [])
-    end.
-
-unit_tests_1(Parent, Options) ->
-    lists:foreach(fun({Url, Method}) ->
-			  execute_req(Url, Method, Options);
-		     ({Url, Method, X_Opts}) ->
-			  execute_req(Url, Method, X_Opts ++ Options)
-		  end, ?TEST_LIST),
-    Parent ! {done, self()}.
-
-verify_chunked_streaming() ->
-    verify_chunked_streaming([]).
-
-verify_chunked_streaming(Options) ->
-    Url = "http://www.httpwatch.com/httpgallery/chunked/",
-    io:format("URL: ~s~n", [Url]),
-    io:format("Fetching data without streaming...~n", []),
-    Result_without_streaming = ibrowse:send_req(
-				 Url, [], get, [],
-				 [{response_format, binary} | Options]),
-    io:format("Fetching data with streaming as list...~n", []),
-    Async_response_list = do_async_req_list(
-			    Url, get, [{response_format, list} | Options]),
-    io:format("Fetching data with streaming as binary...~n", []),
-    Async_response_bin = do_async_req_list(
-			   Url, get, [{response_format, binary} | Options]),
-    compare_responses(Result_without_streaming, Async_response_list, Async_response_bin).
-
-compare_responses({ok, St_code, _, Body}, {ok, St_code, _, Body}, {ok, St_code, _, Body}) ->
-    success;
-compare_responses({ok, St_code, _, Body_1}, {ok, St_code, _, Body_2}, {ok, St_code, _, Body_3}) ->
-    case Body_1 of
-	Body_2 ->
-	    io:format("Body_1 and Body_2 match~n", []);
-	Body_3 ->
-	    io:format("Body_1 and Body_3 match~n", []);
-	_ when Body_2 == Body_3 ->
-	    io:format("Body_2 and Body_3 match~n", []);
-	_ ->
-	    io:format("All three bodies are different!~n", [])
-    end,
-    io:format("Body_1 -> ~p~n", [Body_1]),
-    io:format("Body_2 -> ~p~n", [Body_2]),
-    io:format("Body_3 -> ~p~n", [Body_3]),
-    fail_bodies_mismatch;
-compare_responses(R1, R2, R3) ->
-    io:format("R1 -> ~p~n", [R1]),
-    io:format("R2 -> ~p~n", [R2]),
-    io:format("R3 -> ~p~n", [R3]),
-    fail.
-
-%% do_async_req_list(Url) ->
-%%     do_async_req_list(Url, get).
-
-%% do_async_req_list(Url, Method) ->
-%%     do_async_req_list(Url, Method, [{stream_to, self()},
-%% 				    {stream_chunk_size, 1000}]).
-
-do_async_req_list(Url, Method, Options) ->
-    {Pid,_} = erlang:spawn_monitor(?MODULE, i_do_async_req_list,
-				   [self(), Url, Method,
-				    Options ++ [{stream_chunk_size, 1000}]]),
-    io:format("Spawned process ~p~n", [Pid]),
-    wait_for_resp(Pid).
-
-wait_for_resp(Pid) ->
-    receive
-	{async_result, Pid, Res} ->
-	    Res;
-	{async_result, Other_pid, _} ->
-	    io:format("~p: Waiting for result from ~p: got from ~p~n", [self(), Pid, Other_pid]),
-	    wait_for_resp(Pid);
-	{'DOWN', _, _, Pid, Reason} ->
-	    {'EXIT', Reason};
-	{'DOWN', _, _, _, _} ->
-	    wait_for_resp(Pid);
-	Msg ->
-	    io:format("Recvd unknown message: ~p~n", [Msg]),
-	    wait_for_resp(Pid)
-    after 10000 ->
-	  {error, timeout}
-    end.
-
-i_do_async_req_list(Parent, Url, Method, Options) ->
-    Res = ibrowse:send_req(Url, [], Method, [], [{stream_to, self()} | Options]),
-    case Res of
-	{ibrowse_req_id, Req_id} ->
-	    Result = wait_for_async_resp(Req_id, undefined, undefined, []),
-	    Parent ! {async_result, self(), Result};
-	Err ->
-	    Parent ! {async_result, self(), Err}
-    end.
-
-wait_for_async_resp(Req_id, Acc_Stat_code, Acc_Headers, Body) ->
-    receive
-	{ibrowse_async_headers, Req_id, StatCode, Headers} ->
-	    wait_for_async_resp(Req_id, StatCode, Headers, Body);
-	{ibrowse_async_response_end, Req_id} ->
-	    Body_1 = list_to_binary(lists:reverse(Body)),
-	    {ok, Acc_Stat_code, Acc_Headers, Body_1};
-	{ibrowse_async_response, Req_id, Data} ->
-	    wait_for_async_resp(Req_id, Acc_Stat_code, Acc_Headers, [Data | Body]);
-	Err ->
-	    {ok, Acc_Stat_code, Acc_Headers, Err}
-    end.
-
-execute_req(Url, Method, Options) ->
-    io:format("~7.7w, ~50.50s: ", [Method, Url]),
-    Result = (catch ibrowse:send_req(Url, [], Method, [], Options)),
-    case Result of
-	{ok, SCode, _H, _B} ->
-	    io:format("Status code: ~p~n", [SCode]);
-	Err ->
-	    io:format("Err -> ~p~n", [Err])
-    end.
-
-drv_ue_test() ->
-    drv_ue_test(lists:duplicate(1024, 127)).
-drv_ue_test(Data) ->
-    [{port, Port}| _] = ets:lookup(ibrowse_table, port),
-%     erl_ddll:unload_driver("ibrowse_drv"),
-%     timer:sleep(1000),
-%     erl_ddll:load_driver("../priv", "ibrowse_drv"),
-%     Port = open_port({spawn, "ibrowse_drv"}, []),
-    {Time, Res} = timer:tc(ibrowse_lib, drv_ue, [Data, Port]),
-    io:format("Time -> ~p~n", [Time]),
-    io:format("Data Length -> ~p~n", [length(Data)]),
-    io:format("Res Length -> ~p~n", [length(Res)]).
-%    io:format("Result -> ~s~n", [Res]).
-
-ue_test() ->
-    ue_test(lists:duplicate(1024, $?)).
-ue_test(Data) ->
-    {Time, Res} = timer:tc(ibrowse_lib, url_encode, [Data]),
-    io:format("Time -> ~p~n", [Time]),
-    io:format("Data Length -> ~p~n", [length(Data)]),
-    io:format("Res Length -> ~p~n", [length(Res)]).
-%    io:format("Result -> ~s~n", [Res]).
-
-log_msg(Fmt, Args) ->
-    io:format("~s -- " ++ Fmt,
-	      [ibrowse_lib:printable_date() | Args]).
diff --git a/test/etap/test_util.erl.in b/test/etap/test_util.erl.in
index 948958c..2650fbb 100644
--- a/test/etap/test_util.erl.in
+++ b/test/etap/test_util.erl.in
@@ -22,7 +22,7 @@ builddir() ->
     "@abs_top_builddir@".
 
 init_code_path() ->
-    Paths = ["couchdb", "ibrowse"],
+    Paths = ["couchdb"],
     lists:foreach(fun(Name) ->
         code:add_pathz(filename:join([builddir(), "src", Name]))
     end, Paths).
-- 
1.6.6.1


couchdb-0009-Workaround-for-system-wide-ibrowse.patch:
 couch_rep_httpc.erl |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE couchdb-0009-Workaround-for-system-wide-ibrowse.patch ---
>From f5f39e28f112a6755eb7d94f6445615d69233ce2 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 9/9] Workaround for system-wide ibrowse

---
 src/couchdb/couch_rep_httpc.erl |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/couchdb/couch_rep_httpc.erl b/src/couchdb/couch_rep_httpc.erl
index 63783dc..d430590 100644
--- a/src/couchdb/couch_rep_httpc.erl
+++ b/src/couchdb/couch_rep_httpc.erl
@@ -170,12 +170,12 @@ redirected_request(Req, RedirectUrl) ->
 
 spawn_worker_process(Req) ->
     Url = ibrowse_lib:parse_url(Req#http_db.url),
-    {ok, Pid} = ibrowse_http_client:start(Url),
+    {ok, Pid} = ibrowse_http_client:start({undefined, Url, {[{ssl_imp, new}], (Url#url.protocol == https)}}),
     Pid.
 
 spawn_link_worker_process(Req) ->
     Url = ibrowse_lib:parse_url(Req#http_db.url),
-    {ok, Pid} = ibrowse_http_client:start_link(Url),
+    {ok, Pid} = ibrowse_http_client:start_link({undefined, Url, {[{ssl_imp, new}], (Url#url.protocol == https)}}),
     Pid.
 
 maybe_decompress(Headers, Body) ->
-- 
1.6.6.1


couchdb-0001-Force-init-script-installation.patch:
 configure.ac |   17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

Index: couchdb-0001-Force-init-script-installation.patch
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-12/couchdb-0001-Force-init-script-installation.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- couchdb-0001-Force-init-script-installation.patch	15 Jun 2010 05:08:06 -0000	1.2
+++ couchdb-0001-Force-init-script-installation.patch	22 Jun 2010 04:34:14 -0000	1.3
@@ -1,7 +1,7 @@
-From 4180fb6424162cfb8ee49f108c86fc408ddf640d Mon Sep 17 00:00:00 2001
+From aa0475810703b02802770b7a20b2124f211323a5 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/7] Force init script installation
+Subject: [PATCH 1/9] Force init script installation
 
 ---
  configure.ac |   16 +++-------------

couchdb-0002-Install-into-erllibdir-by-default.patch:
 bin/Makefile.am    |    5 -----
 bin/Makefile.in    |    6 ------
 bin/couchdb.tpl.in |    4 ----
 configure          |    5 ++---
 4 files changed, 2 insertions(+), 18 deletions(-)

Index: couchdb-0002-Install-into-erllibdir-by-default.patch
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-12/couchdb-0002-Install-into-erllibdir-by-default.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- couchdb-0002-Install-into-erllibdir-by-default.patch	15 Jun 2010 05:08:06 -0000	1.2
+++ couchdb-0002-Install-into-erllibdir-by-default.patch	22 Jun 2010 04:34:14 -0000	1.3
@@ -1,12 +1,70 @@
-From e3f247d873c8245c05f573295c1a2e021614f0af Mon Sep 17 00:00:00 2001
+From bd7d0ee9502faaad1960665c690df5f910fca8e0 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/7] Install into erllibdir by default
+Subject: [PATCH 2/9] Install into erllibdir by default
 
 ---
- configure |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ bin/Makefile.am    |    5 -----
+ bin/Makefile.in    |    6 ------
+ bin/couchdb.tpl.in |    4 ----
+ configure          |    4 ++--
+ 4 files changed, 2 insertions(+), 17 deletions(-)
 
+diff --git a/bin/Makefile.am b/bin/Makefile.am
+index 2f1f0f0..96bcb98 100644
+--- a/bin/Makefile.am
++++ b/bin/Makefile.am
+@@ -32,11 +32,6 @@ couchdb: couchdb.tpl
+ 	sed -e "s|%ERL%|$(ERL)|g" \
+ 	    -e "s|%ICU_CONFIG%|$(ICU_CONFIG)|g" \
+ 	    -e "s|%bindir%|@bindir@|g" \
+-	    -e "s|%localerlanglibdir%|@localerlanglibdir@|g" \
+-	    -e "s|%couchdbebindir%|couch- at version@/ebin|g" \
+-	    -e "s|%mochiwebebindir%|mochiweb-r97/ebin|g" \
+-	    -e "s|%ibrowseebindir%|ibrowse-1.5.2/ebin|g" \
+-	    -e "s|%oauthebindir%|erlang-oauth/ebin|g" \
+ 	    -e "s|%defaultini%|default.ini|g" \
+ 	    -e "s|%localini%|local.ini|g" \
+ 	    -e "s|%localconfdir%|@localconfdir@|g" \
+diff --git a/bin/Makefile.in b/bin/Makefile.in
+index 28c6197..3402e85 100644
+--- a/bin/Makefile.in
++++ b/bin/Makefile.in
+@@ -194,7 +194,6 @@ localconfdir = @localconfdir@
+ localdatadir = @localdatadir@
+ localdocdir = @localdocdir@
+ localedir = @localedir@
+-localerlanglibdir = @localerlanglibdir@
+ locallibbindir = @locallibbindir@
+ locallibdir = @locallibdir@
+ localstatedir = @localstatedir@
+@@ -520,11 +519,6 @@ couchdb: couchdb.tpl
+ 	sed -e "s|%ERL%|$(ERL)|g" \
+ 	    -e "s|%ICU_CONFIG%|$(ICU_CONFIG)|g" \
+ 	    -e "s|%bindir%|@bindir@|g" \
+-	    -e "s|%localerlanglibdir%|@localerlanglibdir@|g" \
+-	    -e "s|%couchdbebindir%|couch- at version@/ebin|g" \
+-	    -e "s|%mochiwebebindir%|mochiweb-r97/ebin|g" \
+-	    -e "s|%ibrowseebindir%|ibrowse-1.5.2/ebin|g" \
+-	    -e "s|%oauthebindir%|erlang-oauth/ebin|g" \
+ 	    -e "s|%defaultini%|default.ini|g" \
+ 	    -e "s|%localini%|local.ini|g" \
+ 	    -e "s|%localconfdir%|@localconfdir@|g" \
+diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in
+index 78cf755..69807b3 100644
+--- a/bin/couchdb.tpl.in
++++ b/bin/couchdb.tpl.in
+@@ -216,10 +216,6 @@ start_couchdb () {
+     fi
+     command="`%ICU_CONFIG% --invoke` \
+         %ERL% $interactive_option -smp auto -sasl errlog_type error +K true \
+-        -pa %localerlanglibdir%/%couchdbebindir% \
+-            %localerlanglibdir%/%mochiwebebindir% \
+-            %localerlanglibdir%/%ibrowseebindir% \
+-            %localerlanglibdir%/%oauthebindir% \
+         -eval \"application:load(ibrowse)\" \
+         -eval \"application:load(oauth)\" \
+         -eval \"application:load(crypto)\" \
 diff --git a/configure b/configure
 index f1a2c03..5309998 100755
 --- a/configure

couchdb-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         |   50 ---
 src/erlang-oauth/Makefile.in         |  476 -----------------------------------
 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_rsa_sha1.erl  |   30 --
 src/erlang-oauth/oauth_unix.erl      |   16 -
 src/erlang-oauth/oauth_uri.erl       |   88 ------
 15 files changed, 3 insertions(+), 838 deletions(-)

Index: couchdb-0003-Remove-bundled-erlang-oauth-library.patch
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-12/couchdb-0003-Remove-bundled-erlang-oauth-library.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- couchdb-0003-Remove-bundled-erlang-oauth-library.patch	15 Jun 2010 05:08:06 -0000	1.2
+++ couchdb-0003-Remove-bundled-erlang-oauth-library.patch	22 Jun 2010 04:34:14 -0000	1.3
@@ -1,7 +1,7 @@
-From 8d31e5ff75531deecbf9279fe0e819e9c4bdae5c Mon Sep 17 00:00:00 2001
+From d2db461f578e0e70ec5f88c8bacfc351361b4934 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/7] Remove bundled erlang-oauth library
+Subject: [PATCH 3/9] Remove bundled erlang-oauth library
 
 ---
  configure                            |    3 -

couchdb-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          |  467 ------------------------------------------
 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(+), 1738 deletions(-)

Index: couchdb-0004-Remove-bundled-erlang-etap-library.patch
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-12/couchdb-0004-Remove-bundled-erlang-etap-library.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- couchdb-0004-Remove-bundled-erlang-etap-library.patch	15 Jun 2010 05:08:06 -0000	1.2
+++ couchdb-0004-Remove-bundled-erlang-etap-library.patch	22 Jun 2010 04:34:14 -0000	1.3
@@ -1,7 +1,7 @@
-From 4312a2e8f45586ea2d6f2794854100da6f4092b7 Mon Sep 17 00:00:00 2001
+From 7c8034f57c13f0e2122280eea22a369f3fecd538 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/7] Remove bundled erlang-etap library
+Subject: [PATCH 4/9] Remove bundled erlang-etap library
 
 ---
  configure                     |    3 -

couchdb-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/030-doc-from-json.t         |    2 
 b/test/etap/031-doc-to-json.t           |    2 
 b/test/etap/test_util.erl.in            |    2 
 b/test/run_native_process.es            |    1 
 b/test/runner.sh                        |    3 
 src/mochiweb/Makefile.am                |   80 --
 src/mochiweb/Makefile.in                |  506 ------------------
 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              |  525 -------------------
 src/mochiweb/mochijson2.erl             |  621 ----------------------
 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       |  186 ------
 src/mochiweb/mochiweb_html.erl          |  880 --------------------------------
 src/mochiweb/mochiweb_http.erl          |  142 -----
 src/mochiweb/mochiweb_multipart.erl     |  429 ---------------
 src/mochiweb/mochiweb_request.erl       |  790 ----------------------------
 src/mochiweb/mochiweb_response.erl      |   56 --
 src/mochiweb/mochiweb_skel.erl          |   71 --
 src/mochiweb/mochiweb_socket_server.erl |  248 ---------
 src/mochiweb/mochiweb_sup.erl           |   34 -
 src/mochiweb/mochiweb_util.erl          |  579 ---------------------
 src/mochiweb/reloader.erl               |  124 ----
 35 files changed, 6 insertions(+), 6871 deletions(-)

Index: couchdb-0005-Remove-bundled-mochiweb-library.patch
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-12/couchdb-0005-Remove-bundled-mochiweb-library.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- couchdb-0005-Remove-bundled-mochiweb-library.patch	15 Jun 2010 05:08:06 -0000	1.1
+++ couchdb-0005-Remove-bundled-mochiweb-library.patch	22 Jun 2010 04:34:14 -0000	1.2
@@ -1,7 +1,7 @@
-From 29bc14d67186bc0b7fc82b31ca1bae9354a439a2 Mon Sep 17 00:00:00 2001
+From d14c7c5a1adcdaa2cb5d809114fa4e0fba28c486 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/7] Remove bundled mochiweb library
+Subject: [PATCH 5/9] Remove bundled mochiweb library
 
 ---
  configure                               |    3 -

couchdb-0006-Remove-pid-file-after-stop.patch:
 couchdb.tpl.in |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Index: couchdb-0006-Remove-pid-file-after-stop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-12/couchdb-0006-Remove-pid-file-after-stop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- couchdb-0006-Remove-pid-file-after-stop.patch	15 Jun 2010 05:08:06 -0000	1.1
+++ couchdb-0006-Remove-pid-file-after-stop.patch	22 Jun 2010 04:34:14 -0000	1.2
@@ -1,17 +1,17 @@
-From 24308e72761870d7608ebead2a8ebd32106c4d83 Mon Sep 17 00:00:00 2001
+From 1378dc83269bdfab046c1cd354ffcb52551895a5 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/7] Remove pid-file after stop
+Subject: [PATCH 6/9] Remove pid-file after stop
 
 ---
  bin/couchdb.tpl.in |    4 +---
  1 files changed, 1 insertions(+), 3 deletions(-)
 
 diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in
-index 78cf755..e74f708 100644
+index 69807b3..7d5651e 100644
 --- a/bin/couchdb.tpl.in
 +++ b/bin/couchdb.tpl.in
-@@ -266,10 +266,8 @@ EOF
+@@ -262,10 +262,8 @@ EOF
  
  stop_couchdb () {
      PID=`_get_pid`

couchdb-0007-Fix-for-system-wide-mochiweb.patch:
 couch_db.hrl   |    4 ++--
 couch_util.erl |   15 ++++++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

Index: couchdb-0007-Fix-for-system-wide-mochiweb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-12/couchdb-0007-Fix-for-system-wide-mochiweb.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- couchdb-0007-Fix-for-system-wide-mochiweb.patch	15 Jun 2010 05:08:06 -0000	1.1
+++ couchdb-0007-Fix-for-system-wide-mochiweb.patch	22 Jun 2010 04:34:14 -0000	1.2
@@ -1,7 +1,7 @@
-From 4cd1b65aa50d551664bec8d8ac8241d223c9448a Mon Sep 17 00:00:00 2001
+From 2699c9a1de2203b83a75496b54655f4dcc05d6a1 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Mon, 7 Jun 2010 23:01:25 +0400
-Subject: [PATCH 7/7] Fix for system-wide mochiweb
+Subject: [PATCH 7/9] Fix for system-wide mochiweb
 
 ---
  src/couchdb/couch_db.hrl   |    4 ++--


Index: couchdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-12/couchdb.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- couchdb.spec	15 Jun 2010 05:08:06 -0000	1.12
+++ couchdb.spec	22 Jun 2010 04:34:14 -0000	1.13
@@ -4,7 +4,7 @@
 
 Name:           couchdb
 Version:        0.10.2
-Release:        10%{?dist}
+Release:        14%{?dist}
 Summary:        A document database server, accessible via a RESTful JSON API
 
 Group:          Applications/Databases
@@ -20,34 +20,32 @@ Patch5:		couchdb-0005-Remove-bundled-moc
 Patch6:		couchdb-0006-Remove-pid-file-after-stop.patch
 # Backported from 0.11.0
 Patch7:		couchdb-0007-Fix-for-system-wide-mochiweb.patch
+Patch8:		couchdb-0008-Remove-bundled-ibrowse-library.patch
+Patch9:		couchdb-0009-Workaround-for-system-wide-ibrowse.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  curl-devel
-BuildRequires:  erlang
+BuildRequires:	curl-devel
+BuildRequires:	erlang
 BuildRequires:	erlang-etap
+BuildRequires:	erlang-ibrowse
 BuildRequires:	erlang-mochiweb
 BuildRequires:	erlang-oauth
-BuildRequires:  help2man
-BuildRequires:  js-devel
-BuildRequires:  libicu-devel
-# /usr/bin/prove
+BuildRequires:	help2man
+BuildRequires:	js-devel
+BuildRequires:	libicu-devel
+# For /usr/bin/prove
 BuildRequires:	perl(Test::Harness)
 
-#Requires: erlang-crypto
-#Requires: erlang-erts
-#Requires: erlang-ibrowse
-#Requires: erlang-inets
-#Requires: erlang-kernel
-#Requires: erlang-mochiweb
-#Requires: erlang-oauth
-#Requires: erlang-ssl
-#Requires: erlang-stdlib
-#Requires: erlang-tools
-Requires:       erlang
-Requires:	erlang-oauth
+
+Requires:	erlang-crypto
+Requires:	erlang-erts
+Requires:	erlang-ibrowse
+Requires:	erlang-inets
+Requires:	erlang-kernel
 Requires:	erlang-mochiweb
-# For %{_bindir}/icu-config
-Requires:       libicu-devel
+Requires:	erlang-oauth
+Requires:	erlang-stdlib
+Requires:	erlang-tools
 
 #Initscripts
 Requires(post): chkconfig
@@ -75,10 +73,15 @@ JavaScript acting as the default view de
 %patch5 -p1 -b .remove_bundled_mochiweb
 %patch6 -p1 -b .remove_pid_file
 %patch7 -p1 -b .fix_for_mochi
+%patch8 -p1 -b .remove_bundled_ibrowse
+%patch9 -p1 -b .workaround_for_ssl
 # Restore original timestamps to avoid reconfiguring
 touch -r configure.ac.initenabled configure.ac
 touch -r configure.fix_lib_path configure
 
+# Get rid if icu-config
+sed -i -e 's,`%ICU_CONFIG% --invoke`,env \\"LD_LIBRARY_PATH=%{_libdir}:${LD_LIBRARY_PATH}\\",g' bin/couchdb.tpl.in
+
 
 %build
 %configure
@@ -89,38 +92,18 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-## Install couchdb initscript
+# Install our custom couchdb initscript
 install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
+# ...and remove default one
+rm $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/couchdb
 
-# Create /var/log/couchdb
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/couchdb
-
-# Create /var/run/couchdb
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/couchdb
-
-# Create /var/lib/couchdb
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/couchdb
-
-# Create /etc/couchdb/default.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/couchdb/default.d
-
-# Create /etc/couchdb/local.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/couchdb/local.d
-
-## Use /etc/sysconfig instead of /etc/default
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-mv $RPM_BUILD_ROOT%{_sysconfdir}/default/couchdb \
-$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/couchdb
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/default
+# Use /etc/sysconfig instead of /etc/default
+mv $RPM_BUILD_ROOT%{_sysconfdir}/{default,sysconfig}
 
-# Remove unecessary files
-rm $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/couchdb
+# Remove wrongly placed doc files
 rm -rf  $RPM_BUILD_ROOT%{_datadir}/doc/couchdb
 
-# clean-up .la archives
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-
-# fix respawn timeout to match default value
+# Fix respawn timeout to match default value
 sed -i s,^COUCHDB_RESPAWN_TIMEOUT=5,COUCHDB_RESPAWN_TIMEOUT=0,g $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/couchdb
 
 
@@ -141,13 +124,9 @@ exit 0
 
 
 %post
-/sbin/ldconfig
 /sbin/chkconfig --add couchdb
 
 
-%postun -p /sbin/ldconfig
-
-
 %preun
 if [ $1 = 0 ] ; then
     /sbin/service couchdb stop >/dev/null 2>&1
@@ -166,15 +145,30 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/couchdb
 %config(noreplace) %{_sysconfdir}/logrotate.d/couchdb
 %{_initrddir}/couchdb
-%{_bindir}/*
-%{_libdir}/erlang/lib/*
+%{_bindir}/couchdb
+%{_bindir}/couchjs
+%{_libdir}/erlang/lib/couch-%{version}
 %{_datadir}/couchdb
-%{_mandir}/man1/*
+%{_mandir}/man1/couchdb.1.*
+%{_mandir}/man1/couchjs.1.*
 %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/log/couchdb
 %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/run/couchdb
 %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/lib/couchdb
 
 %changelog
+* Fri Jun 18 2010 Peter Lemenkov <lemenkov at gmail.com> 0.10.2-14
+- Massive spec cleanup
+
+* Fri Jun 18 2010 Peter Lemenkov <lemenkov at gmail.com> 0.10.2-13
+- Remove ldconfig invocation (no system-wide shared libraries)
+- Removed icu-config requires
+
+* Tue Jun 15 2010 Peter Lemenkov <lemenkov at gmail.com> 0.10.2-12
+- Narrow explicit requires
+
+* Tue Jun  8 2010 Peter Lemenkov <lemenkov at gmail.com> 0.10.2-11
+- Remove bundled ibrowse library (see rhbz #581282).
+
 * Mon Jun  7 2010 Peter Lemenkov <lemenkov at gmail.com> 0.10.2-10
 - Use system-wide erlang-mochiweb instead of bundled copy (rhbz #581284)
 - Added %%check target and necessary BuildRequires - etap, oauth, mochiweb


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-12/import.log,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- import.log	15 Jun 2010 05:08:06 -0000	1.11
+++ import.log	22 Jun 2010 04:34:14 -0000	1.12
@@ -9,3 +9,4 @@ couchdb-0_10_2-3_fc12:F-12:couchdb-0.10.
 couchdb-0_10_2-4_fc12:F-12:couchdb-0.10.2-4.fc12.src.rpm:1274958445
 couchdb-0_10_2-8_fc12:F-12:couchdb-0.10.2-8.fc12.src.rpm:1275370345
 couchdb-0_10_2-10_fc12:F-12:couchdb-0.10.2-10.fc12.src.rpm:1276578446
+couchdb-0_10_2-14_fc12:F-12:couchdb-0.10.2-14.fc12.src.rpm:1277181203

