[couchdb] Fix for R16B and latest mochiweb
Peter Lemenkov
peter at fedoraproject.org
Fri May 31 11:06:30 UTC 2013
commit ed74ead4ec6abebe37025d6e5bbeae4f7eef0f37
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Fri May 31 15:06:12 2013 +0400
Fix for R16B and latest mochiweb
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
...-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 +-
couchdb-0005-Don-t-use-bundled-libraries.patch | 4 +-
couchdb-0006-Fixes-for-system-wide-ibrowse.patch | 4 +-
couchdb-0007-Remove-pid-file-after-stop.patch | 4 +-
couchdb-0008-Change-respawn-timeout-to-0.patch | 4 +-
...Mostly-cosmetic-proplist-ordering-in-R16B.patch | 4 +-
...art-necessary-application-before-mochiweb.patch | 26 ++++++++++++++++++++
couchdb.spec | 7 ++++-
11 files changed, 50 insertions(+), 19 deletions(-)
---
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 2bedb25..b2d79d1 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 eddb11fa70ff4632797bb17d88e07bd1a36b0845 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 01/10] Do not gzip doc-files and do not install installation
instructions
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
@@ -85,5 +85,5 @@ index 87a8d9e..089de31 100644
$(top_builddir)/test/etap/run
--
-1.8.2
+1.8.2.1
diff --git a/couchdb-0002-Install-docs-into-versioned-directory.patch b/couchdb-0002-Install-docs-into-versioned-directory.patch
index de1ab7f..b5412b8 100644
--- a/couchdb-0002-Install-docs-into-versioned-directory.patch
+++ b/couchdb-0002-Install-docs-into-versioned-directory.patch
@@ -1,7 +1,7 @@
From d5891c80acb8d28d03a90125f7633fb0cff44e38 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 02/10] Install docs into versioned directory
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -22,5 +22,5 @@ index 99543b0..56aebc5 100644
AC_SUBST([localstatelibdir], [${localstatedir}/lib/${package_identifier}])
AC_SUBST([localstatelogdir], [${localstatedir}/log/${package_identifier}])
--
-1.8.2
+1.8.2.1
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 0d05387..e069b03 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 35ca0d515abf41b76f71c808785e4d6ff31a30d9 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 03/10] More directories to search for place for init-script
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -42,5 +42,5 @@ index 56aebc5..f5c9238 100644
fi
fi
--
-1.8.2
+1.8.2.1
diff --git a/couchdb-0004-Install-into-erllibdir-by-default.patch b/couchdb-0004-Install-into-erllibdir-by-default.patch
index b81fe36..faf4b15 100644
--- a/couchdb-0004-Install-into-erllibdir-by-default.patch
+++ b/couchdb-0004-Install-into-erllibdir-by-default.patch
@@ -1,7 +1,7 @@
From 5bcb9077f029721942a186656aa696cf124b2293 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 04/10] Install into erllibdir by default
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -31,5 +31,5 @@ index f5c9238..d61e6a7 100644
fi
--
-1.8.2
+1.8.2.1
diff --git a/couchdb-0005-Don-t-use-bundled-libraries.patch b/couchdb-0005-Don-t-use-bundled-libraries.patch
index 146b8be..94bd56f 100644
--- a/couchdb-0005-Don-t-use-bundled-libraries.patch
+++ b/couchdb-0005-Don-t-use-bundled-libraries.patch
@@ -1,7 +1,7 @@
From b2d3ed89ca22fb005cb6ed0907d0a35bd5da010e 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 libraries
+Subject: [PATCH 05/10] Don't use bundled libraries
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -83,5 +83,5 @@ index f17be20..85644dc 100644
code:add_patha(filename:join([builddir(), "src", Name]))
end, Paths).
--
-1.8.2
+1.8.2.1
diff --git a/couchdb-0006-Fixes-for-system-wide-ibrowse.patch b/couchdb-0006-Fixes-for-system-wide-ibrowse.patch
index 129cdf1..e7b2220 100644
--- a/couchdb-0006-Fixes-for-system-wide-ibrowse.patch
+++ b/couchdb-0006-Fixes-for-system-wide-ibrowse.patch
@@ -1,7 +1,7 @@
From 056b4a8d69c043db404707d7cad717cf108037e6 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 06/10] Fixes for system-wide ibrowse
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
@@ -55,5 +55,5 @@ index bd590ed..934e5ce 100644
-import(couch_util, [
get_value/2,
--
-1.8.2
+1.8.2.1
diff --git a/couchdb-0007-Remove-pid-file-after-stop.patch b/couchdb-0007-Remove-pid-file-after-stop.patch
index 03fadd4..dd2a374 100644
--- a/couchdb-0007-Remove-pid-file-after-stop.patch
+++ b/couchdb-0007-Remove-pid-file-after-stop.patch
@@ -1,7 +1,7 @@
From 5aab65c4a4dc10f8ac0d5caa26576c43ea54bef7 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 07/10] Remove pid-file after stop
---
bin/couchdb.tpl.in | 1 +
@@ -20,5 +20,5 @@ index 31bc7d9..54c42cb 100644
if test -n "$PID"; then
if kill -0 $PID 2> /dev/null; then
--
-1.8.2
+1.8.2.1
diff --git a/couchdb-0008-Change-respawn-timeout-to-0.patch b/couchdb-0008-Change-respawn-timeout-to-0.patch
index bbe1d52..f0b9eaf 100644
--- a/couchdb-0008-Change-respawn-timeout-to-0.patch
+++ b/couchdb-0008-Change-respawn-timeout-to-0.patch
@@ -1,7 +1,7 @@
From d70f792c7f599f214e05f616ff71c6c4ecaae0f1 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 08/10] 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.8.2
+1.8.2.1
diff --git a/couchdb-0009-Mostly-cosmetic-proplist-ordering-in-R16B.patch b/couchdb-0009-Mostly-cosmetic-proplist-ordering-in-R16B.patch
index 1c51de4..cfa8471 100644
--- a/couchdb-0009-Mostly-cosmetic-proplist-ordering-in-R16B.patch
+++ b/couchdb-0009-Mostly-cosmetic-proplist-ordering-in-R16B.patch
@@ -1,7 +1,7 @@
From 1de07dd7ccb0696a59306fc58d73231dcbbfb367 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Fri, 15 Mar 2013 16:41:59 +0400
-Subject: [PATCH 9/9] Mostly cosmetic - proplist ordering in R16B
+Subject: [PATCH 09/10] Mostly cosmetic - proplist ordering in R16B
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -29,5 +29,5 @@ index dee8876..44744d6 100755
),
--
-1.8.2
+1.8.2.1
diff --git a/couchdb-0010-Start-necessary-application-before-mochiweb.patch b/couchdb-0010-Start-necessary-application-before-mochiweb.patch
new file mode 100644
index 0000000..de0408b
--- /dev/null
+++ b/couchdb-0010-Start-necessary-application-before-mochiweb.patch
@@ -0,0 +1,26 @@
+From 2fae45e9291ed98a6066d9be7f49dbe863da7d99 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Fri, 31 May 2013 15:01:42 +0400
+Subject: [PATCH 10/10] Start necessary application before mochiweb
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ src/couchdb/couch_app.erl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/couchdb/couch_app.erl b/src/couchdb/couch_app.erl
+index f109780..4cf4862 100644
+--- a/src/couchdb/couch_app.erl
++++ b/src/couchdb/couch_app.erl
+@@ -20,7 +20,7 @@
+
+ start(_Type, DefaultIniFiles) ->
+ IniFiles = get_ini_files(DefaultIniFiles),
+- case start_apps([crypto, public_key, sasl, inets, oauth, ssl, ibrowse, mochiweb, os_mon]) of
++ case start_apps([crypto, public_key, sasl, inets, oauth, ssl, ibrowse, xmerl, compiler, syntax_tools, mochiweb, os_mon]) of
+ ok ->
+ couch_server_sup:start_link(IniFiles);
+ {error, Reason} ->
+--
+1.8.2.1
+
diff --git a/couchdb.spec b/couchdb.spec
index cfd3766..9513bcc 100644
--- a/couchdb.spec
+++ b/couchdb.spec
@@ -4,7 +4,7 @@
Name: couchdb
Version: 1.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A document database server, accessible via a RESTful JSON API
Group: Applications/Databases
@@ -23,6 +23,7 @@ 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-Mostly-cosmetic-proplist-ordering-in-R16B.patch
+Patch10: couchdb-0010-Start-necessary-application-before-mochiweb.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -94,6 +95,7 @@ JavaScript acting as the default view definition language.
%patch8 -p1 -b .fix_respawn
%if 0%{?fedora} > 18
%patch9 -p1 -b .fix_proplist_ordering_r16b
+%patch10 -p1 -b .start_necessary_apps_before_mochiweb
%endif
# Remove bundled libraries
@@ -230,6 +232,9 @@ fi
%changelog
+* Fri May 31 2013 Peter Lemenkov <lemenkov at gmail.com> - 1.2.2-2
+- Fix for R16B and latest mochiweb
+
* Mon Apr 15 2013 Peter Lemenkov <lemenkov at gmail.com> - 1.2.2-1
- Ver. 1.2.2 (bugfix release)
More information about the scm-commits
mailing list