rpms/couchdb/F-12 couchdb-0.10.2-remove_bundled_oauth.diff, NONE, 1.1 couchdb.spec, 1.9, 1.10 import.log, 1.8, 1.9

[Peter Lemenkov]

Author: peter

Update of /cvs/pkgs/rpms/couchdb/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18474/F-12

Modified Files:
	couchdb.spec import.log 
Added Files:
	couchdb-0.10.2-remove_bundled_oauth.diff 
Log Message:
Remove bundled erlang-oauth library

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

--- NEW FILE couchdb-0.10.2-remove_bundled_oauth.diff ---
--- src/Makefile.am	2009-09-30 07:11:03.000000000 +0400
+++ src/Makefile.am	2010-05-14 11:22:53.861117171 +0400
@@ -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
--- src/Makefile.in	2010-04-11 17:54:10.000000000 +0400
+++ src/Makefile.in	2010-05-14 11:22:43.407116852 +0400
@@ -239,7 +239,7 @@
 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:
--- configure~	2010-04-11 17:54:12.000000000 +0400
+++ configure	2010-05-14 11:38:01.635117281 +0400
@@ -12137,8 +12137,6 @@
 
 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 @@
     "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" ;;
--- configure.ac~	2009-11-12 06:25:31.000000000 +0300
+++ configure.ac	2010-05-14 11:40:25.522117742 +0400
@@ -335,7 +335,6 @@
 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])


Index: couchdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-12/couchdb.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- couchdb.spec	13 May 2010 12:14:10 -0000	1.9
+++ couchdb.spec	27 May 2010 11:07:44 -0000	1.10
@@ -5,7 +5,7 @@
 
 Name:           couchdb
 Version:        0.10.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A document database server, accessible via a RESTful JSON API
 
 Group:          Applications/Databases
@@ -15,6 +15,7 @@ Source0:        http://www.apache.org/di
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  erlang
@@ -24,6 +25,7 @@ BuildRequires:  help2man
 BuildRequires:  curl-devel
 
 Requires:       erlang
+Requires:	erlang-oauth
 # For %{_bindir}/icu-config
 Requires:       libicu-devel
 
@@ -47,6 +49,8 @@ JavaScript acting as the default view de
 %setup -q -n %{tarname}-%{version}
 %patch0 -p1 -b .initenabled
 %patch1 -p0 -b .fix_lib_path
+%patch2 -p0 -b .remove_bundled_oauth
+rm -rf src/erlang-oauth
 touch -r configure.ac.initenabled configure.ac
 touch -r configure.fix_lib_path configure
 
@@ -141,6 +145,9 @@ fi
 %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/lib/couchdb
 
 %changelog
+* Fri May 14 2010 Peter Lemenkov <lemenkov at gmail.com> 0.10.2-4
+- Use system-wide erlang-oauth instead of bundled copy
+
 * Thu May 13 2010 Peter Lemenkov <lemenkov at gmail.com> 0.10.2-3
 - Fixed init-script to use /etc/sysconfig/couchdb values (see rhbz #583004)
 - Fixed installation location of beam-files (moved to erlang directory)


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-12/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- import.log	13 May 2010 12:14:10 -0000	1.8
+++ import.log	27 May 2010 11:07:44 -0000	1.9
@@ -6,3 +6,4 @@ couchdb-0_10_0-1_fc11:F-12:couchdb-0.10.
 couchdb-0_10_0-2_fc11:F-12:couchdb-0.10.0-2.fc11.src.rpm:1255652085
 couchdb-0_10_2-1_fc12:F-12:couchdb-0.10.2-1.fc12.src.rpm:1273240260
 couchdb-0_10_2-3_fc12:F-12:couchdb-0.10.2-3.fc12.src.rpm:1273752828
+couchdb-0_10_2-4_fc12:F-12:couchdb-0.10.2-4.fc12.src.rpm:1274958445