rpms/couchdb/devel couchdb-0005-Remove-pid-file-after-stop.diff, NONE, 1.1 couchdb.spec, 1.17, 1.18 import.log, 1.14, 1.15

[Peter Lemenkov]

Author: peter

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

Modified Files:
	couchdb.spec import.log 
Added Files:
	couchdb-0005-Remove-pid-file-after-stop.diff 
Log Message:
Remove pid-file when stopping CouchDB

couchdb-0005-Remove-pid-file-after-stop.diff:
 couchdb.tpl.in |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE couchdb-0005-Remove-pid-file-after-stop.diff ---
diff --git a/bin/couchdb.tpl.in~ b/bin/couchdb.tpl.in
index 78cf755..e74f708 100644
--- a/bin/couchdb.tpl.in~
+++ b/bin/couchdb.tpl.in
@@ -266,10 +266,8 @@ EOF
 
 stop_couchdb () {
     PID=`_get_pid`
+    rm -f $PID_FILE
     if test -n "$PID"; then
-        if test "$1" = "false"; then
-            echo > $PID_FILE
-        fi
         if kill -0 $PID 2> /dev/null; then
             if kill -1 $PID 2> /dev/null; then
                 if test "$1" = "false"; then


Index: couchdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/devel/couchdb.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- couchdb.spec	1 Jun 2010 04:59:13 -0000	1.17
+++ couchdb.spec	2 Jun 2010 05:35:13 -0000	1.18
@@ -4,7 +4,7 @@
 
 Name:           couchdb
 Version:        0.10.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A document database server, accessible via a RESTful JSON API
 
 Group:          Applications/Databases
@@ -16,6 +16,7 @@ Patch1:		couchdb-0001-Force-init-script-
 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
+Patch5:		couchdb-0005-Remove-pid-file-after-stop.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  erlang
@@ -52,6 +53,7 @@ JavaScript acting as the default view de
 %patch2 -p1 -b .fix_lib_path
 %patch3 -p1 -b .remove_bundled_oauth
 %patch4 -p1 -b .remove_bundled_etap
+%patch5 -p1 -b .remove_pid_file
 rm -rf src/erlang-oauth
 rm -rf src/etap
 # Restore original timestamps to avoid reconfiguring
@@ -149,6 +151,9 @@ fi
 %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/lib/couchdb
 
 %changelog
+* Wed Jun  2 2010 Peter Lemenkov <lemenkov at gmail.com> 0.10.2-9
+- Remove pid-file after stopping CouchDB
+
 * Tue Jun  1 2010 Peter Lemenkov <lemenkov at gmail.com> 0.10.2-8
 - Suppress unneeded message while stopping CouchDB via init-script
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/devel/import.log,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- import.log	1 Jun 2010 04:59:13 -0000	1.14
+++ import.log	2 Jun 2010 05:35:13 -0000	1.15
@@ -12,3 +12,4 @@ couchdb-0_10_2-5_fc12:HEAD:couchdb-0.10.
 couchdb-0_10_2-6_fc12:HEAD:couchdb-0.10.2-6.fc12.src.rpm:1275308416
 couchdb-0_10_2-7_fc12:HEAD:couchdb-0.10.2-7.fc12.src.rpm:1275310561
 couchdb-0_10_2-8_fc12:HEAD:couchdb-0.10.2-8.fc12.src.rpm:1275368318
+couchdb-0_10_2-9_fc12:HEAD:couchdb-0.10.2-9.fc12.src.rpm:1275456881