[couchdb] Unbundle snappy
Peter Lemenkov
peter at fedoraproject.org
Tue Oct 30 15:25:56 UTC 2012
commit eee4f1b86005559cc47eae4efe7e430e529a8767
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue Oct 30 19:25:47 2012 +0400
Unbundle snappy
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
...-doc-files-and-do-not-install-installatio.patch | 2 +-
...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 | 133 --------------------
couchdb-0005-Don-t-use-bundled-libraries.patch | 87 +++++++++++++
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 +-
couchdb.spec | 34 +++--
10 files changed, 117 insertions(+), 157 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 64c6087..60dedfd 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
@@ -85,5 +85,5 @@ index 8e16baf..30f5264 100644
$(top_builddir)/test/etap/run
--
-1.7.12
+1.7.12.1
diff --git a/couchdb-0002-Install-docs-into-versioned-directory.patch b/couchdb-0002-Install-docs-into-versioned-directory.patch
index e53b9bb..157dbc8 100644
--- a/couchdb-0002-Install-docs-into-versioned-directory.patch
+++ b/couchdb-0002-Install-docs-into-versioned-directory.patch
@@ -22,5 +22,5 @@ index de212ec..a2ab2ae 100644
AC_SUBST([localstatelibdir], [${localstatedir}/lib/${package_identifier}])
AC_SUBST([localstatelogdir], [${localstatedir}/log/${package_identifier}])
--
-1.7.12
+1.7.12.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 518b37e..08a82f6 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
@@ -42,5 +42,5 @@ index a2ab2ae..f023e51 100644
fi
fi
--
-1.7.12
+1.7.12.1
diff --git a/couchdb-0004-Install-into-erllibdir-by-default.patch b/couchdb-0004-Install-into-erllibdir-by-default.patch
index 2998ac5..2229042 100644
--- a/couchdb-0004-Install-into-erllibdir-by-default.patch
+++ b/couchdb-0004-Install-into-erllibdir-by-default.patch
@@ -31,5 +31,5 @@ index f023e51..5ce0e96 100644
fi
--
-1.7.12
+1.7.12.1
diff --git a/couchdb-0005-Don-t-use-bundled-libraries.patch b/couchdb-0005-Don-t-use-bundled-libraries.patch
new file mode 100644
index 0000000..a63eef8
--- /dev/null
+++ b/couchdb-0005-Don-t-use-bundled-libraries.patch
@@ -0,0 +1,87 @@
+From e760b89280f06668375dbffa24640332648c67c7 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/8] Don't use bundled libraries
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ configure.ac | 7 -------
+ src/Makefile.am | 2 +-
+ src/ejson/Makefile.am | 8 ++------
+ test/etap/test_util.erl.in | 3 +--
+ 4 files changed, 4 insertions(+), 16 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5ce0e96..d0a10ae 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_HEADERS([src/snappy/google-snappy/config.h])
+
+ AM_INIT_AUTOMAKE([1.6.3 foreign])
+
+@@ -599,12 +598,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/erlang-oauth/Makefile])
+-AC_CONFIG_FILES([src/etap/Makefile])
+-AC_CONFIG_FILES([src/ibrowse/Makefile])
+-AC_CONFIG_FILES([src/mochiweb/Makefile])
+-AC_CONFIG_FILES([src/snappy/Makefile])
+-AC_CONFIG_FILES([src/snappy/google-snappy/snappy-stubs-public.h])
+ AC_CONFIG_FILES([src/ejson/Makefile])
+ AC_CONFIG_FILES([test/Makefile])
+ AC_CONFIG_FILES([test/bench/Makefile])
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 047f1ee..c6126fc 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 ejson erlang-oauth etap ibrowse mochiweb snappy
++SUBDIRS = couchdb ejson
+diff --git a/src/ejson/Makefile.am b/src/ejson/Makefile.am
+index c1e07db..6f2dfaa 100644
+--- a/src/ejson/Makefile.am
++++ b/src/ejson/Makefile.am
+@@ -44,15 +44,11 @@ EJSON_C_HDRS = \
+
+ ejson_file_collection = \
+ ejson.app.in \
+- ejson.erl \
+- mochijson2.erl \
+- mochinum.erl
++ ejson.erl
+
+ ejsonebin_make_generated_file_list = \
+ ejson.app \
+- ejson.beam \
+- mochijson2.beam \
+- mochinum.beam
++ ejson.beam
+
+ EXTRA_DIST = \
+ $(EJSON_C_HDRS) \
+diff --git a/test/etap/test_util.erl.in b/test/etap/test_util.erl.in
+index f17be20..85644dc 100644
+--- a/test/etap/test_util.erl.in
++++ b/test/etap/test_util.erl.in
+@@ -23,8 +23,7 @@ builddir() ->
+ "@abs_top_builddir@".
+
+ init_code_path() ->
+- Paths = ["etap", "couchdb", "ejson", "erlang-oauth", "ibrowse", "mochiweb",
+- "snappy"],
++ Paths = ["couchdb", "ejson"],
+ lists:foreach(fun(Name) ->
+ code:add_patha(filename:join([builddir(), "src", Name]))
+ end, Paths).
+--
+1.7.12.1
+
diff --git a/couchdb-0006-Fixes-for-system-wide-ibrowse.patch b/couchdb-0006-Fixes-for-system-wide-ibrowse.patch
index 961e948..2a62ade 100644
--- a/couchdb-0006-Fixes-for-system-wide-ibrowse.patch
+++ b/couchdb-0006-Fixes-for-system-wide-ibrowse.patch
@@ -1,4 +1,4 @@
-From 07f58574b3899c9da5f148680d67a828d943140d Mon Sep 17 00:00:00 2001
+From b9f87a70dcaad72af4c352614946b6eb6e60cb46 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/8] Fixes for system-wide ibrowse
@@ -55,5 +55,5 @@ index bd590ed..934e5ce 100644
-import(couch_util, [
get_value/2,
--
-1.7.12
+1.7.12.1
diff --git a/couchdb-0007-Remove-pid-file-after-stop.patch b/couchdb-0007-Remove-pid-file-after-stop.patch
index 398ff58..814d179 100644
--- a/couchdb-0007-Remove-pid-file-after-stop.patch
+++ b/couchdb-0007-Remove-pid-file-after-stop.patch
@@ -1,4 +1,4 @@
-From 59352d9d7d4baebe3576f6f7b39b3499d102d955 Mon Sep 17 00:00:00 2001
+From 83df58b736c56374d705f532d74ff6fc64987384 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/8] Remove pid-file after stop
@@ -24,5 +24,5 @@ index eab27b5..d7a0482 100644
if kill -1 $PID 2> /dev/null; then
if test "$1" = "false"; then
--
-1.7.12
+1.7.12.1
diff --git a/couchdb-0008-Change-respawn-timeout-to-0.patch b/couchdb-0008-Change-respawn-timeout-to-0.patch
index a4f234b..d882cf0 100644
--- a/couchdb-0008-Change-respawn-timeout-to-0.patch
+++ b/couchdb-0008-Change-respawn-timeout-to-0.patch
@@ -1,4 +1,4 @@
-From 8d090ff218c7c195f034dbf6f090eabbe28f6b6c Mon Sep 17 00:00:00 2001
+From 81edc422be58099e832f5d81cf776b8fc964785f 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/8] Change respawn timeout to 0.
@@ -20,5 +20,5 @@ index c2a3f2a..f589c0a 100644
+COUCHDB_RESPAWN_TIMEOUT=0
COUCHDB_OPTIONS=
--
-1.7.12
+1.7.12.1
diff --git a/couchdb.spec b/couchdb.spec
index 8c5b4a4..9e9babb 100644
--- a/couchdb.spec
+++ b/couchdb.spec
@@ -4,7 +4,7 @@
Name: couchdb
Version: 1.2.0
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: A document database server, accessible via a RESTful JSON API
Group: Applications/Databases
@@ -18,7 +18,7 @@ Patch1: couchdb-0001-Do-not-gzip-doc-files-and-do-not-install-installatio.patch
Patch2: couchdb-0002-Install-docs-into-versioned-directory.patch
Patch3: couchdb-0003-More-directories-to-search-for-place-for-init-script.patch
Patch4: couchdb-0004-Install-into-erllibdir-by-default.patch
-Patch5: couchdb-0005-Don-t-use-bundled-etap-erlang-oauth-ibrowse-and-moch.patch
+Patch5: couchdb-0005-Don-t-use-bundled-libraries.patch
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
@@ -35,26 +35,28 @@ BuildRequires: erlang-ibrowse >= 2.2.0
BuildRequires: erlang-mochiweb
BuildRequires: erlang-oauth
BuildRequires: erlang-os_mon
+BuildRequires: erlang-snappy
BuildRequires: help2man
BuildRequires: js-devel
BuildRequires: libicu-devel
# For /usr/bin/prove
BuildRequires: perl(Test::Harness)
-Requires: erlang-crypto
+Requires: erlang-crypto%{?_isa}
# Error:erlang(erlang:max/2) in R12B and below
# Error:erlang(erlang:min/2) in R12B and below
-Requires: erlang-erts >= R13B
-Requires: erlang-ibrowse >= 2.2.0
-Requires: erlang-inets
-Requires: erlang-kernel
-Requires: erlang-mochiweb
-Requires: erlang-oauth
-Requires: erlang-os_mon
+Requires: erlang-erts%{?_isa} >= R13B
+Requires: erlang-ibrowse%{?_isa} >= 2.2.0
+Requires: erlang-inets%{?_isa}
+Requires: erlang-kernel%{?_isa}
+Requires: erlang-mochiweb%{?_isa}
+Requires: erlang-oauth%{?_isa}
+Requires: erlang-os_mon%{?_isa}
+BuildRequires: erlang-snappy%{?_isa}
# Error:erlang(unicode:characters_to_binary/1) in R12B and below
-Requires: erlang-stdlib >= R13B
-Requires: erlang-tools
-Requires: erlang-xmerl
+Requires: erlang-stdlib%{?_isa} >= R13B
+Requires: erlang-tools%{?_isa}
+Requires: erlang-xmerl%{?_isa}
#Initscripts
%if 0%{?fc17}%{?fc18}
@@ -95,6 +97,7 @@ rm -rf src/erlang-oauth
rm -rf src/etap
rm -rf src/ibrowse
rm -rf src/mochiweb
+rm -rf src/snappy
# More verbose tests
#sed -i -e "s,prove,prove -v,g" test/etap/run.tpl
@@ -218,7 +221,6 @@ fi
%{_bindir}/couchjs
%{_libdir}/erlang/lib/couch-%{version}/
%{_libdir}/erlang/lib/ejson-0.1.0/
-%{_libdir}/erlang/lib/snappy-1.0.3/
%{_datadir}/%{name}
%{_mandir}/man1/%{name}.1.*
%{_mandir}/man1/couchjs.1.*
@@ -228,6 +230,10 @@ fi
%changelog
+* Tue Oct 30 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.2.0-3
+- Unbundle snappy
+- Add _isa to the Requires
+
* Mon Sep 24 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.2.0-2
- Build fixes
- Temporarily disable verbosity
More information about the scm-commits
mailing list