rpms/couchdb/devel couchdb-0001-Force-init-script-installation.patch, NONE, 1.1 couchdb-0002-Install-into-erllibdir-by-default.patch, NONE, 1.1 couchdb-0003-Remove-bundled-erlang-oauth-library.patch, NONE, 1.1 couchdb-0004-Remove-bundled-erlang-etap-library.patch, NONE, 1.1 couchdb.spec, 1.13, 1.14 import.log, 1.10, 1.11 couchdb-0.10.0-initenabled.patch, 1.1, NONE couchdb-0.10.2-fix-install-lib-location.diff, 1.1, NONE couchdb-0.10.2-remove_bundled_oauth.diff, 1.1, NONE

Thu May 27 11:35:30 UTC 2010

Author: peter

Update of /cvs/pkgs/rpms/couchdb/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22156/devel

Modified Files:
	couchdb.spec import.log 
Added 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 
Removed Files:
	couchdb-0.10.0-initenabled.patch 
	couchdb-0.10.2-fix-install-lib-location.diff 
	couchdb-0.10.2-remove_bundled_oauth.diff 
Log Message:
Remove bundled erlang-etap

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

--- NEW FILE couchdb-0001-Force-init-script-installation.patch ---
>From c63c6662fe59e5c515075b2b9511ccf0438aabc5 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/4] Force init script installation

---
 configure.ac |   16 +++-------------
 1 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index d99408e..e39acc3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -242,19 +242,9 @@ launchd_enabled=false
 
 if test "$use_init" = "yes"; then
    AC_MSG_CHECKING(location of init directory)
-   if test -d /etc/rc.d; then
-       init_enabled=true
-       AC_SUBST([initdir], ['${sysconfdir}/rc.d'])
-       AC_MSG_RESULT(${initdir})
-   else
-       if test -d /etc/init.d; then
-           init_enabled=true
-           AC_SUBST([initdir], ['${sysconfdir}/init.d'])
-           AC_MSG_RESULT(${initdir})
-       else
-           AC_MSG_RESULT(not found)
-       fi
-    fi
+   init_enabled=true
+   AC_SUBST([initdir], ['${sysconfdir}/rc.d'])
+   AC_MSG_RESULT(${initdir})
 fi
 
 if test "$use_launchd" = "yes"; then
-- 
1.6.6.1


couchdb-0002-Install-into-erllibdir-by-default.patch:
 configure |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE couchdb-0002-Install-into-erllibdir-by-default.patch ---
>From 63afe8dc321ed5c418e28b12fc831f19bcf532e7 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/4] Install into erllibdir by default

---
 configure |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index f1a2c03..5309998 100755
--- a/configure
+++ b/configure
@@ -12069,7 +12069,7 @@ localdatadir=${datadir}/${package_identifier}
 
 localdocdir=${datadir}/doc/${package_identifier}
 
-locallibdir=${libdir}/${package_identifier}
+locallibdir=${libdir}
 
 localstatelibdir=${localstatedir}/lib/${package_identifier}
 
@@ -12085,7 +12085,7 @@ if test x${IS_WINDOWS} = xTRUE; then
     localerlanglibdir=${libdir}
 
 else
-    locallibbindir=${locallibdir}/bin
+    locallibbindir=${locallibdir}/erlang/lib/couch-${version}/priv
 
     localerlanglibdir=${locallibdir}/erlang/lib
 
-- 
1.6.6.1


couchdb-0003-Remove-bundled-erlang-oauth-library.patch:
 configure       |    3 ---
 configure.ac    |    1 -
 src/Makefile.am |    2 +-
 src/Makefile.in |    3 +--
 4 files changed, 2 insertions(+), 7 deletions(-)

--- NEW FILE couchdb-0003-Remove-bundled-erlang-oauth-library.patch ---
>From 42a4f19bde9c94685a88b3f3c979de07e39f56ab 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/4] Remove bundled erlang-oauth library

---
 configure       |    3 ---
 configure.ac    |    1 -
 src/Makefile.am |    2 +-
 src/Makefile.in |    2 +-
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 5309998..39dda91 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/erlang-oauth/Makefile"
-
 ac_config_files="$ac_config_files src/etap/Makefile"
 
 ac_config_files="$ac_config_files src/ibrowse/Makefile"
@@ -13160,7 +13158,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/erlang-oauth/Makefile") CONFIG_FILES="$CONFIG_FILES src/erlang-oauth/Makefile" ;;
     "src/etap/Makefile") CONFIG_FILES="$CONFIG_FILES src/etap/Makefile" ;;
     "src/ibrowse/Makefile") CONFIG_FILES="$CONFIG_FILES src/ibrowse/Makefile" ;;
     "src/mochiweb/Makefile") CONFIG_FILES="$CONFIG_FILES src/mochiweb/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index e39acc3..effb28b 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/erlang-oauth/Makefile])
 AC_CONFIG_FILES([src/etap/Makefile])
 AC_CONFIG_FILES([src/ibrowse/Makefile])
 AC_CONFIG_FILES([src/mochiweb/Makefile])
diff --git a/src/Makefile.am b/src/Makefile.am
index b9529f9..e577138 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 erlang-oauth etap ibrowse mochiweb
+SUBDIRS = couchdb etap ibrowse mochiweb
diff --git a/src/Makefile.in b/src/Makefile.in
index 54fdb7b..480da98 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 erlang-oauth etap ibrowse mochiweb
+SUBDIRS = couchdb etap ibrowse mochiweb
 all: all-recursive
 
 .SUFFIXES:
-- 
1.6.6.1


couchdb-0004-Remove-bundled-erlang-etap-library.patch:
 configure       |    3 ---
 configure.ac    |    1 -
 src/Makefile.am |    2 +-
 src/Makefile.in |    3 +--
 4 files changed, 2 insertions(+), 7 deletions(-)

--- NEW FILE couchdb-0004-Remove-bundled-erlang-etap-library.patch ---
>From c2946e7f2cd60daf7cd75491caf5108161db45be 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/4] Remove bundled erlang-etap library

---
 configure       |    3 ---
 configure.ac    |    1 -
 src/Makefile.am |    2 +-
 src/Makefile.in |    2 +-
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 39dda91..ca7732f 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/etap/Makefile"
-
 ac_config_files="$ac_config_files src/ibrowse/Makefile"
 
 ac_config_files="$ac_config_files src/mochiweb/Makefile"
@@ -13158,7 +13156,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/etap/Makefile") CONFIG_FILES="$CONFIG_FILES src/etap/Makefile" ;;
     "src/ibrowse/Makefile") CONFIG_FILES="$CONFIG_FILES src/ibrowse/Makefile" ;;
     "src/mochiweb/Makefile") CONFIG_FILES="$CONFIG_FILES src/mochiweb/Makefile" ;;
     "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index effb28b..0478b4f 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/etap/Makefile])
 AC_CONFIG_FILES([src/ibrowse/Makefile])
 AC_CONFIG_FILES([src/mochiweb/Makefile])
 AC_CONFIG_FILES([test/Makefile])
diff --git a/src/Makefile.am b/src/Makefile.am
index e577138..19a5d20 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 etap ibrowse mochiweb
+SUBDIRS = couchdb ibrowse mochiweb
diff --git a/src/Makefile.in b/src/Makefile.in
index 480da98..2422e39 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 etap ibrowse mochiweb
+SUBDIRS = couchdb ibrowse mochiweb
 all: all-recursive
 
 .SUFFIXES:
-- 
1.6.6.1



Index: couchdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/devel/couchdb.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- couchdb.spec	14 May 2010 07:50:02 -0000	1.13
+++ couchdb.spec	27 May 2010 11:35:30 -0000	1.14
@@ -5,7 +5,7 @@
 
 Name:           couchdb
 Version:        0.10.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A document database server, accessible via a RESTful JSON API
 
 Group:          Applications/Databases
@@ -13,9 +13,10 @@ License:        ASL 2.0
 URL:            http://couchdb.apache.org/
 Source0:        http://www.apache.org/dist/%{name}/%{version}/%{tarname}-%{version}.tar.gz
 Source1:        %{name}.init
-Patch0:         %{name}-0.10.0-initenabled.patch
-Patch1:         %{name}-0.10.2-fix-install-lib-location.diff
-Patch2:		%{name}-0.10.2-remove_bundled_oauth.diff
+Patch1:		couchdb-0001-Force-init-script-installation.patch
+Patch2:		couchdb-0002-Install-into-erllibdir-by-default.patch
+Patch3:		couchdb-0003-Remove-bundled-erlang-oauth-library.patch
+Patch4:		couchdb-0004-Remove-bundled-erlang-etap-library.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  erlang
@@ -47,10 +48,13 @@ JavaScript acting as the default view de
 
 %prep
 %setup -q -n %{tarname}-%{version}
-%patch0 -p1 -b .initenabled
-%patch1 -p0 -b .fix_lib_path
-%patch2 -p0 -b .remove_bundled_oauth
+%patch1 -p1 -b .initenabled
+%patch2 -p1 -b .fix_lib_path
+%patch3 -p1 -b .remove_bundled_oauth
+%patch4 -p1 -b .remove_bundled_etap
 rm -rf src/erlang-oauth
+rm -rf src/etap
+# Restore original timestamps to avoid reconfiguring
 touch -r configure.ac.initenabled configure.ac
 touch -r configure.fix_lib_path configure
 
@@ -145,6 +149,9 @@ fi
 %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/lib/couchdb
 
 %changelog
+* Thu May 27 2010 Peter Lemenkov <lemenkov at gmail.com> 0.10.2-5
+- Use system-wide erlang-etap instead of bundled copy
+
 * Fri May 14 2010 Peter Lemenkov <lemenkov at gmail.com> 0.10.2-4
 - Use system-wide erlang-oauth instead of bundled copy
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/devel/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- import.log	14 May 2010 07:50:02 -0000	1.10
+++ import.log	27 May 2010 11:35:30 -0000	1.11
@@ -8,3 +8,4 @@ couchdb-0_10_2-1_fc12:HEAD:couchdb-0.10.
 couchdb-0_10_2-2_fc12:HEAD:couchdb-0.10.2-2.fc12.src.rpm:1273243278
 couchdb-0_10_2-3_fc12:HEAD:couchdb-0.10.2-3.fc12.src.rpm:1273752686
 couchdb-0_10_2-4_fc12:HEAD:couchdb-0.10.2-4.fc12.src.rpm:1273823324
+couchdb-0_10_2-5_fc12:HEAD:couchdb-0.10.2-5.fc12.src.rpm:1274960067


--- couchdb-0.10.0-initenabled.patch DELETED ---


--- couchdb-0.10.2-fix-install-lib-location.diff DELETED ---


--- couchdb-0.10.2-remove_bundled_oauth.diff DELETED ---

