rpms/couchdb/F-10 couchdb.init, 1.2, 1.3 couchdb.spec, 1.2, 1.3 import.log, 1.2, 1.3

[Allisson Azevedo]

Author: allisson

Update of /cvs/pkgs/rpms/couchdb/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2006/F-10

Modified Files:
	couchdb.init couchdb.spec import.log 
Log Message:

- Fix permission for ini files.
- Fix couchdb.init start process.



Index: couchdb.init
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-10/couchdb.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- couchdb.init	7 May 2009 01:27:01 -0000	1.2
+++ couchdb.init	8 May 2009 00:29:07 -0000	1.3
@@ -26,8 +26,6 @@
 exec="/usr/bin/couchdb"
 prog="couchdb"
 config="/etc/sysconfig/couchdb"
-couchdb_pid_file="/var/run/couchdb/couchdb.pid"
-couchdb_ini_file="/etc/couchdb/default.ini"
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
@@ -37,7 +35,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user couchdb "$exec -b -c $couchdb_ini_file"
+    daemon --user couchdb "$exec -b"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
@@ -46,8 +44,7 @@ start() {
 
 stop() {
     echo -n $"Stopping $prog: "
-    # stop it here, often "killproc $prog"
-    daemon --user couchdb "$exec -d  -p $couchdb_pid_file"
+    daemon --user couchdb "$exec -d"
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile


Index: couchdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-10/couchdb.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- couchdb.spec	7 May 2009 01:27:01 -0000	1.2
+++ couchdb.spec	8 May 2009 00:29:07 -0000	1.3
@@ -4,7 +4,7 @@
 %define couchdb_home %{_localstatedir}/lib/couchdb
 Name:           couchdb
 Version:        0.9.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A document database server, accessible via a RESTful JSON API
 
 Group:          Applications/Databases
@@ -109,8 +109,8 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS CHANGES LICENSE NEWS NOTICE README THANKS
 %dir %{_sysconfdir}/couchdb
-%config(noreplace) %{_sysconfdir}/couchdb/default.ini
-%config(noreplace) %{_sysconfdir}/couchdb/local.ini
+%config(noreplace) %attr(0644, %{couchdb_user}, root) %{_sysconfdir}/couchdb/default.ini
+%config(noreplace) %attr(0644, %{couchdb_user}, root) %{_sysconfdir}/couchdb/local.ini
 #%config(noreplace) %{_sysconfdir}/default/couchdb
 %config(noreplace) %{_sysconfdir}/sysconfig/couchdb
 %config(noreplace) %{_sysconfdir}/logrotate.d/couchdb
@@ -125,6 +125,10 @@ fi
 %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/lib/couchdb
 
 %changelog
+* Tue Apr 21 2009 Allisson Azevedo <allisson at gmail.com> 0.9.0-2
+- Fix permission for ini files.
+- Fix couchdb.init start process.
+
 * Tue Apr 21 2009 Allisson Azevedo <allisson at gmail.com> 0.9.0-1
 - Update to 0.9.0.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	7 May 2009 01:27:01 -0000	1.2
+++ import.log	8 May 2009 00:29:07 -0000	1.3
@@ -1,2 +1,3 @@
 couchdb-0_8_1-4_fc10:F-10:couchdb-0.8.1-4.fc10.src.rpm:1236040037
 couchdb-0_9_0-1_fc10:F-10:couchdb-0.9.0-1.fc10.src.rpm:1241659502
+couchdb-0_9_0-2_fc10:F-10:couchdb-0.9.0-2.fc10.src.rpm:1241742435