rpms/couchdb/EL-6 couchdb-0001-Force-init-script-installation.patch, 1.2, 1.3 couchdb-0002-Install-into-erllibdir-by-default.patch, 1.2, 1.3 couchdb-0003-Remove-bundled-erlang-oauth-library.patch, 1.2, 1.3 couchdb-0004-Remove-bundled-erlang-etap-library.patch, 1.2, 1.3 couchdb-0005-Remove-bundled-mochiweb-library.patch, 1.1, 1.2 couchdb-0006-Remove-pid-file-after-stop.patch, 1.1, 1.2 couchdb-0007-Fix-for-system-wide-mochiweb.patch, 1.1, 1.2 couchdb-0008-Remove-bundled-ibrowse-library.patch, 1.1, 1.2 couchdb-0009-Workaround-for-system-wide-ibrowse.patch, 1.1, 1.2 couchdb.spec, 1.12, 1.13 import.log, 1.11, 1.12
Peter Lemenkov
peter at fedoraproject.org
Fri Jun 18 08:57:12 UTC 2010
Author: peter
Update of /cvs/pkgs/rpms/couchdb/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7897/EL-6
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-0008-Remove-bundled-ibrowse-library.patch
couchdb-0009-Workaround-for-system-wide-ibrowse.patch
couchdb.spec import.log
Log Message:
Latest fixes and spec cleanups
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/EL-6/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 18:18:25 -0000 1.2
+++ couchdb-0001-Force-init-script-installation.patch 18 Jun 2010 08:57:10 -0000 1.3
@@ -1,4 +1,4 @@
-From c18945d391db8e124cd0ab375cccc1c22f10049f 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/9] Force init script installation
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/EL-6/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 18:18:25 -0000 1.2
+++ couchdb-0002-Install-into-erllibdir-by-default.patch 18 Jun 2010 08:57:11 -0000 1.3
@@ -1,12 +1,70 @@
-From c34ad18d8be63ec405dbbf860b150cd0b93f78a8 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/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/EL-6/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 18:18:25 -0000 1.2
+++ couchdb-0003-Remove-bundled-erlang-oauth-library.patch 18 Jun 2010 08:57:11 -0000 1.3
@@ -1,4 +1,4 @@
-From a90dc29c0acf05144ec696d627e5152fc9863fd3 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/9] Remove bundled erlang-oauth library
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/EL-6/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 18:18:25 -0000 1.2
+++ couchdb-0004-Remove-bundled-erlang-etap-library.patch 18 Jun 2010 08:57:11 -0000 1.3
@@ -1,4 +1,4 @@
-From 418ef87bda575be30e9f1c06615a0406ea4adc16 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/9] Remove bundled erlang-etap library
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/EL-6/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 18:18:25 -0000 1.1
+++ couchdb-0005-Remove-bundled-mochiweb-library.patch 18 Jun 2010 08:57:11 -0000 1.2
@@ -1,4 +1,4 @@
-From 34f67a3a90904eba2c7dc085584e790b28ac6fbd 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/9] Remove bundled mochiweb library
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/EL-6/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 18:18:26 -0000 1.1
+++ couchdb-0006-Remove-pid-file-after-stop.patch 18 Jun 2010 08:57:11 -0000 1.2
@@ -1,4 +1,4 @@
-From d452bf7568a1c3d86b9dd5ad576aefd207f35ed2 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/9] Remove pid-file after stop
@@ -8,10 +8,10 @@ Subject: [PATCH 6/9] Remove pid-file aft
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/EL-6/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 18:18:26 -0000 1.1
+++ couchdb-0007-Fix-for-system-wide-mochiweb.patch 18 Jun 2010 08:57:11 -0000 1.2
@@ -1,4 +1,4 @@
-From 2054f93657cb57be30afa0dd45c129ed94399c40 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/9] Fix for system-wide mochiweb
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(-)
Index: couchdb-0008-Remove-bundled-ibrowse-library.patch
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/EL-6/couchdb-0008-Remove-bundled-ibrowse-library.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- couchdb-0008-Remove-bundled-ibrowse-library.patch 15 Jun 2010 18:18:26 -0000 1.1
+++ couchdb-0008-Remove-bundled-ibrowse-library.patch 18 Jun 2010 08:57:11 -0000 1.2
@@ -1,4 +1,4 @@
-From 40ebb18e8addac7be0daae86918a2f0a4d62e45d Mon Sep 17 00:00:00 2001
+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
couchdb-0009-Workaround-for-system-wide-ibrowse.patch:
couch_rep_httpc.erl | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
Index: couchdb-0009-Workaround-for-system-wide-ibrowse.patch
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/EL-6/couchdb-0009-Workaround-for-system-wide-ibrowse.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- couchdb-0009-Workaround-for-system-wide-ibrowse.patch 15 Jun 2010 18:18:26 -0000 1.1
+++ couchdb-0009-Workaround-for-system-wide-ibrowse.patch 18 Jun 2010 08:57:12 -0000 1.2
@@ -1,4 +1,4 @@
-From 277b71edffb50cc8cbfd967f7c163452d9a91a68 Mon Sep 17 00:00:00 2001
+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
Index: couchdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/EL-6/couchdb.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- couchdb.spec 15 Jun 2010 18:18:26 -0000 1.12
+++ couchdb.spec 18 Jun 2010 08:57:12 -0000 1.13
@@ -4,7 +4,7 @@
Name: couchdb
Version: 0.10.2
-Release: 12%{?dist}
+Release: 14%{?dist}
Summary: A document database server, accessible via a RESTful JSON API
Group: Applications/Databases
@@ -33,7 +33,7 @@ BuildRequires: erlang-oauth
BuildRequires: help2man
BuildRequires: js-devel
BuildRequires: libicu-devel
-# /usr/bin/prove
+# For /usr/bin/prove
BuildRequires: perl(Test::Harness)
@@ -46,8 +46,6 @@ Requires: erlang-mochiweb
Requires: erlang-oauth
Requires: erlang-stdlib
Requires: erlang-tools
-# For %{_bindir}/icu-config
-Requires: libicu-devel
#Initscripts
Requires(post): chkconfig
@@ -81,6 +79,9 @@ JavaScript acting as the default view de
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
@@ -91,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
@@ -143,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
@@ -168,15 +145,24 @@ fi
%config(noreplace) %{_sysconfdir}/sysconfig/couchdb
%config(noreplace) %{_sysconfdir}/logrotate.d/couchdb
%{_initrddir}/couchdb
-%{_bindir}/*
+%{_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
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/EL-6/import.log,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- import.log 15 Jun 2010 18:18:26 -0000 1.11
+++ import.log 18 Jun 2010 08:57:12 -0000 1.12
@@ -9,3 +9,4 @@ couchdb-0_10_2-3_fc12:EL-6:couchdb-0.10.
couchdb-0_10_2-4_fc12:EL-6:couchdb-0.10.2-4.fc12.src.rpm:1274958557
couchdb-0_10_2-8_fc12:EL-6:couchdb-0.10.2-8.fc12.src.rpm:1275370673
couchdb-0_10_2-12_fc12:EL-6:couchdb-0.10.2-12.fc12.src.rpm:1276625548
+couchdb-0_10_2-14_fc12:EL-6:couchdb-0.10.2-14.fc12.src.rpm:1276851298
More information about the scm-commits
mailing list