[couchdb] Ver. 1.2.2 (bugfix release)
Peter Lemenkov
peter at fedoraproject.org
Tue Apr 16 09:56:00 UTC 2013
commit 275c14ae5454303d4c03eaa106e5aaca9b599289
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue Apr 16 13:55:51 2013 +0400
Ver. 1.2.2 (bugfix release)
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
.gitignore | 1 +
...-doc-files-and-do-not-install-installatio.patch | 4 ++--
...002-Install-docs-into-versioned-directory.patch | 6 +++---
...ories-to-search-for-place-for-init-script.patch | 6 +++---
...db-0004-Install-into-erllibdir-by-default.patch | 6 +++---
couchdb-0005-Don-t-use-bundled-libraries.patch | 8 ++++----
couchdb-0006-Fixes-for-system-wide-ibrowse.patch | 4 ++--
couchdb-0007-Remove-pid-file-after-stop.patch | 18 +++++++-----------
couchdb-0008-Change-respawn-timeout-to-0.patch | 4 ++--
...Mostly-cosmetic-proplist-ordering-in-R16B.patch | 4 ++--
couchdb.spec | 9 +++++++--
sources | 2 +-
12 files changed, 37 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9f148a4..95925a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ apache-couchdb-1.0.1.tar.gz
/apache-couchdb-1.1.1.tar.gz
/apache-couchdb-1.2.0.tar.gz
/apache-couchdb-1.2.1.tar.gz
+/apache-couchdb-1.2.2.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 29eb339..2bedb25 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,4 +1,4 @@
-From 5529deed9bfe436616056db37c1e720408eeb271 Mon Sep 17 00:00:00 2001
+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
@@ -85,5 +85,5 @@ index 87a8d9e..089de31 100644
$(top_builddir)/test/etap/run
--
-1.8.1.4
+1.8.2
diff --git a/couchdb-0002-Install-docs-into-versioned-directory.patch b/couchdb-0002-Install-docs-into-versioned-directory.patch
index 488634d..de1ab7f 100644
--- a/couchdb-0002-Install-docs-into-versioned-directory.patch
+++ b/couchdb-0002-Install-docs-into-versioned-directory.patch
@@ -1,4 +1,4 @@
-From d1b22f8cb6f7ec3a2c290f2fc36ea337676ba311 Mon Sep 17 00:00:00 2001
+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
@@ -9,7 +9,7 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index de212ec..a2ab2ae 100644
+index 99543b0..56aebc5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -551,7 +551,7 @@ AC_SUBST([bug_uri], ["LOCAL_BUG_URI"])
@@ -22,5 +22,5 @@ index de212ec..a2ab2ae 100644
AC_SUBST([localstatelibdir], [${localstatedir}/lib/${package_identifier}])
AC_SUBST([localstatelogdir], [${localstatedir}/log/${package_identifier}])
--
-1.8.1.4
+1.8.2
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 8be2c7d..0d05387 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,4 +1,4 @@
-From 9bb5e5c00f5c91dcc6e0cea7d58fdf38788d9cf8 Mon Sep 17 00:00:00 2001
+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
@@ -9,7 +9,7 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
-index a2ab2ae..f023e51 100644
+index 56aebc5..f5c9238 100644
--- a/configure.ac
+++ b/configure.ac
@@ -487,17 +487,23 @@ launchd_enabled=false
@@ -42,5 +42,5 @@ index a2ab2ae..f023e51 100644
fi
fi
--
-1.8.1.4
+1.8.2
diff --git a/couchdb-0004-Install-into-erllibdir-by-default.patch b/couchdb-0004-Install-into-erllibdir-by-default.patch
index 0e42914..b81fe36 100644
--- a/couchdb-0004-Install-into-erllibdir-by-default.patch
+++ b/couchdb-0004-Install-into-erllibdir-by-default.patch
@@ -1,4 +1,4 @@
-From 264253d91c0cc2e40641d1f5cd7c9c0a94eaa754 Mon Sep 17 00:00:00 2001
+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
@@ -9,7 +9,7 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
-index f023e51..5ce0e96 100644
+index f5c9238..d61e6a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -558,7 +558,7 @@ AC_SUBST([bug_uri], ["LOCAL_BUG_URI"])
@@ -31,5 +31,5 @@ index f023e51..5ce0e96 100644
fi
--
-1.8.1.4
+1.8.2
diff --git a/couchdb-0005-Don-t-use-bundled-libraries.patch b/couchdb-0005-Don-t-use-bundled-libraries.patch
index f8a3475..146b8be 100644
--- a/couchdb-0005-Don-t-use-bundled-libraries.patch
+++ b/couchdb-0005-Don-t-use-bundled-libraries.patch
@@ -1,4 +1,4 @@
-From 24d466ee2b0d6e48f757cff17fae946056f3efea Mon Sep 17 00:00:00 2001
+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
@@ -12,13 +12,13 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
4 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 5ce0e96..d0a10ae 100644
+index d61e6a7..bee274e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,6 @@ AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
- AM_CONFIG_HEADER([config.h])
+ AC_CONFIG_HEADER([config.h])
-AC_CONFIG_HEADERS([src/snappy/google-snappy/config.h])
AM_INIT_AUTOMAKE([1.6.3 foreign])
@@ -83,5 +83,5 @@ index f17be20..85644dc 100644
code:add_patha(filename:join([builddir(), "src", Name]))
end, Paths).
--
-1.8.1.4
+1.8.2
diff --git a/couchdb-0006-Fixes-for-system-wide-ibrowse.patch b/couchdb-0006-Fixes-for-system-wide-ibrowse.patch
index bc264a0..129cdf1 100644
--- a/couchdb-0006-Fixes-for-system-wide-ibrowse.patch
+++ b/couchdb-0006-Fixes-for-system-wide-ibrowse.patch
@@ -1,4 +1,4 @@
-From 13a9cf10eb1836be46f609004950968a1dc20863 Mon Sep 17 00:00:00 2001
+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
@@ -55,5 +55,5 @@ index bd590ed..934e5ce 100644
-import(couch_util, [
get_value/2,
--
-1.8.1.4
+1.8.2
diff --git a/couchdb-0007-Remove-pid-file-after-stop.patch b/couchdb-0007-Remove-pid-file-after-stop.patch
index 6f3befb..03fadd4 100644
--- a/couchdb-0007-Remove-pid-file-after-stop.patch
+++ b/couchdb-0007-Remove-pid-file-after-stop.patch
@@ -1,28 +1,24 @@
-From 15703e7d4a71ecb16d23d80408a741869449f64d Mon Sep 17 00:00:00 2001
+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
---
- bin/couchdb.tpl.in | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
+ bin/couchdb.tpl.in | 1 +
+ 1 file changed, 1 insertion(+)
diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in
-index eab27b5..d7a0482 100644
+index 31bc7d9..54c42cb 100644
--- a/bin/couchdb.tpl.in
+++ b/bin/couchdb.tpl.in
-@@ -267,10 +267,8 @@ EOF
+@@ -267,6 +267,7 @@ EOF
stop_couchdb () {
PID=`_get_pid`
+ rm -f $PID_FILE
+ STOP_TIMEOUT=60
if test -n "$PID"; then
-- if test "$1" = "false"; then
-- echo > $PID_FILE
-- fi
if kill -0 $PID 2> /dev/null; then
- if kill -1 $PID 2> /dev/null; then
- if test "$1" = "false"; then
--
-1.8.1.4
+1.8.2
diff --git a/couchdb-0008-Change-respawn-timeout-to-0.patch b/couchdb-0008-Change-respawn-timeout-to-0.patch
index 2df88e5..bbe1d52 100644
--- a/couchdb-0008-Change-respawn-timeout-to-0.patch
+++ b/couchdb-0008-Change-respawn-timeout-to-0.patch
@@ -1,4 +1,4 @@
-From f6a5c427a9a630d79d41ea74f6e96c62c39ee92e Mon Sep 17 00:00:00 2001
+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.
@@ -20,5 +20,5 @@ index c2a3f2a..f589c0a 100644
+COUCHDB_RESPAWN_TIMEOUT=0
COUCHDB_OPTIONS=
--
-1.8.1.4
+1.8.2
diff --git a/couchdb-0009-Mostly-cosmetic-proplist-ordering-in-R16B.patch b/couchdb-0009-Mostly-cosmetic-proplist-ordering-in-R16B.patch
index f6215ea..1c51de4 100644
--- a/couchdb-0009-Mostly-cosmetic-proplist-ordering-in-R16B.patch
+++ b/couchdb-0009-Mostly-cosmetic-proplist-ordering-in-R16B.patch
@@ -1,4 +1,4 @@
-From d3ae6a2dd08b44ba0f59a3a17b654a3a11a72261 Mon Sep 17 00:00:00 2001
+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
@@ -29,5 +29,5 @@ index dee8876..44744d6 100755
),
--
-1.8.1.4
+1.8.2
diff --git a/couchdb.spec b/couchdb.spec
index ce93006..cfd3766 100644
--- a/couchdb.spec
+++ b/couchdb.spec
@@ -3,8 +3,8 @@
%define couchdb_home %{_localstatedir}/lib/couchdb
Name: couchdb
-Version: 1.2.1
-Release: 4%{?dist}
+Version: 1.2.2
+Release: 1%{?dist}
Summary: A document database server, accessible via a RESTful JSON API
Group: Applications/Databases
@@ -92,7 +92,9 @@ JavaScript acting as the default view definition language.
%patch6 -p1 -b .workaround_for_system_wide_ibrowse
%patch7 -p1 -b .remove_pid_file
%patch8 -p1 -b .fix_respawn
+%if 0%{?fedora} > 18
%patch9 -p1 -b .fix_proplist_ordering_r16b
+%endif
# Remove bundled libraries
rm -rf src/erlang-oauth
@@ -228,6 +230,9 @@ fi
%changelog
+* Mon Apr 15 2013 Peter Lemenkov <lemenkov at gmail.com> - 1.2.2-1
+- Ver. 1.2.2 (bugfix release)
+
* Fri Mar 15 2013 Peter Lemenkov <lemenkov at gmail.com> - 1.2.1-4
- Fix FTBFS in Rawhide (F-19)
diff --git a/sources b/sources
index 121845c..94e736c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-df75b03e56c2431ede7625200f0d44a7 apache-couchdb-1.2.1.tar.gz
+6cc49c22fadcf7d8cf8aa34dae71b203 apache-couchdb-1.2.2.tar.gz
More information about the scm-commits
mailing list