rpms/couchdb/devel couchdb-0.10.2-fix-install-lib-location.diff, NONE, 1.1 couchdb.init, 1.4, 1.5 couchdb.spec, 1.11, 1.12 import.log, 1.8, 1.9

[Peter Lemenkov]

Author: peter

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

Modified Files:
	couchdb.init couchdb.spec import.log 
Added Files:
	couchdb-0.10.2-fix-install-lib-location.diff 
Log Message:
Fixed rhbz #583004

couchdb-0.10.2-fix-install-lib-location.diff:
 configure |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE couchdb-0.10.2-fix-install-lib-location.diff ---
--- configure	2010-04-11 17:54:12.000000000 +0400
+++ configure	2010-05-13 14:19:23.993505445 +0400
@@ -12069,7 +12069,7 @@
 
 localdocdir=${datadir}/doc/${package_identifier}
 
-locallibdir=${libdir}/${package_identifier}
+locallibdir=${libdir}
 
 localstatelibdir=${localstatedir}/lib/${package_identifier}
 
@@ -12085,7 +12085,7 @@
     localerlanglibdir=${libdir}
 
 else
-    locallibbindir=${locallibdir}/bin
+    locallibbindir=${locallibdir}/erlang/lib/couch-${version}/priv
 
     localerlanglibdir=${locallibdir}/erlang/lib
 


Index: couchdb.init
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/devel/couchdb.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- couchdb.init	7 May 2010 13:49:11 -0000	1.4
+++ couchdb.init	13 May 2010 12:12:00 -0000	1.5
@@ -27,15 +27,29 @@ exec="/usr/bin/couchdb"
 prog="couchdb"
 config="/etc/sysconfig/couchdb"
 
+# default values
+COUCHDB_USER=couchdb
+COUCHDB_STDOUT_FILE=/dev/null
+COUCHDB_STDERR_FILE=/dev/null
+COUCHDB_RESPAWN_TIMEOUT=0
+COUCHDB_OPTIONS=
+
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
+pidfile=/var/run/couchdb/couchdb.pid
 lockfile=/var/lock/subsys/couchdb
 
 start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user couchdb "$exec -b"
+    rh_status_q && echo -n "already running" && warning && echo && exit 0
+    daemon --user $COUCHDB_USER "$exec \
+	-r $COUCHDB_RESPAWN_TIMEOUT \
+	-o $COUCHDB_STDOUT_FILE \
+	-e $COUCHDB_STDERR_FILE \
+	-p $pidfile \
+	$COUCHDB_OPTIONS -b >/dev/null"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
@@ -44,6 +58,9 @@ start() {
 
 stop() {
     echo -n $"Stopping $prog: "
+    if ! rh_status_q ; then
+	echo -n "already stopped" && warning && echo && exit 0
+    fi
     daemon --user couchdb "$exec -d"
     retval=$?
     echo
@@ -76,11 +93,9 @@ rh_status_q() {
 
 case "$1" in
     start)
-        rh_status_q && exit 0
         $1
         ;;
     stop)
-        rh_status_q || exit 0
         $1
         ;;
     restart)


Index: couchdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/devel/couchdb.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- couchdb.spec	7 May 2010 14:42:14 -0000	1.11
+++ couchdb.spec	13 May 2010 12:12:00 -0000	1.12
@@ -5,7 +5,7 @@
 
 Name:           couchdb
 Version:        0.10.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A document database server, accessible via a RESTful JSON API
 
 Group:          Applications/Databases
@@ -14,6 +14,7 @@ URL:            http://couchdb.apache.or
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  erlang
@@ -45,11 +46,9 @@ JavaScript acting as the default view de
 %prep
 %setup -q -n %{tarname}-%{version}
 %patch0 -p1 -b .initenabled
-touch -r configure.ac.* configure.ac
-# Patch pid location
-#sed -i 's/%localstatedir%\/run\/couchdb.pid/%localstatedir%\/run\/couchdb\/couchdb.pid/g' \
-#bin/couchdb.tpl.in
-
+%patch1 -p0 -b .fix_lib_path
+touch -r configure.ac.initenabled configure.ac
+touch -r configure.fix_lib_path configure
 
 
 %build
@@ -92,6 +91,8 @@ rm -rf  $RPM_BUILD_ROOT%{_datadir}/doc/c
 # clean-up .la archives
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
+# 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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -132,7 +133,7 @@ fi
 %config(noreplace) %{_sysconfdir}/logrotate.d/couchdb
 %{_initrddir}/couchdb
 %{_bindir}/*
-%{_libdir}/couchdb
+%{_libdir}/erlang/lib/*
 %{_datadir}/couchdb
 %{_mandir}/man1/*
 %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/log/couchdb
@@ -140,6 +141,10 @@ fi
 %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/lib/couchdb
 
 %changelog
+* 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)
+
 * Fri May  7 2010 Peter Lemenkov <lemenkov at gmail.com> 0.10.2-2
 - Remove useless BuildRequires
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/devel/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- import.log	7 May 2010 14:42:14 -0000	1.8
+++ import.log	13 May 2010 12:12:00 -0000	1.9
@@ -6,3 +6,4 @@ couchdb-0_10_0-1_fc11:HEAD:couchdb-0.10.
 couchdb-0_10_0-2_fc11:HEAD:couchdb-0.10.0-2.fc11.src.rpm:1255651984
 couchdb-0_10_2-1_fc12:HEAD:couchdb-0.10.2-1.fc12.src.rpm:1273240101
 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