rpms/couchdb/F-11 couchdb-0.9.0-pid.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 couchdb.init, 1.1, 1.2 couchdb.spec, 1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3

[Allisson Azevedo]

Author: allisson

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

Modified Files:
	.cvsignore couchdb.init couchdb.spec import.log sources 
Added Files:
	couchdb-0.9.0-pid.patch 
Log Message:

Update to 0.9.0


couchdb-0.9.0-pid.patch:

--- NEW FILE couchdb-0.9.0-pid.patch ---
diff -up apache-couchdb-0.9.0/bin/couchdb.tpl.in.pid apache-couchdb-0.9.0/bin/couchdb.tpl.in
--- apache-couchdb-0.9.0/bin/couchdb.tpl.in.pid	2009-05-06 19:52:22.000000000 -0300
+++ apache-couchdb-0.9.0/bin/couchdb.tpl.in	2009-05-06 19:52:59.000000000 -0300
@@ -27,7 +27,7 @@ RESPAWN_TIMEOUT=0
 DEFAULT_INI_FILE=%localconfdir%/%defaultini%
 LOCAL_INI_FILE=%localconfdir%/%localini%
 
-PID_FILE=%localstatedir%/run/couchdb.pid
+PID_FILE=%localstatedir%/run/couchdb/couchdb.pid
 
 STDOUT_FILE=couchdb.stdout
 STDERR_FILE=couchdb.stderr


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Mar 2009 00:25:31 -0000	1.2
+++ .cvsignore	7 May 2009 01:24:36 -0000	1.3
@@ -1 +1 @@
-apache-couchdb-0.8.1-incubating.tar.gz
+apache-couchdb-0.9.0.tar.gz


Index: couchdb.init
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-11/couchdb.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- couchdb.init	3 Mar 2009 00:25:31 -0000	1.1
+++ couchdb.init	7 May 2009 01:24:36 -0000	1.2
@@ -26,6 +26,8 @@
 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
 
@@ -35,9 +37,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user couchdb "$exec -b -c $COUCHDB_INI_FILE -p $COUCHDB_PID_FILE \
-    -o $COUCHDB_STDOUT_FILE -e $COUCHDB_STDERR_FILE \
-    -r $COUCHDB_RESPAWN_TIMEOUT"
+    daemon --user couchdb "$exec -b -c $couchdb_ini_file"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
@@ -47,7 +47,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  -p $couchdb_pid_file"
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile


Index: couchdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-11/couchdb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- couchdb.spec	3 Mar 2009 00:25:31 -0000	1.1
+++ couchdb.spec	7 May 2009 01:24:36 -0000	1.2
@@ -3,21 +3,23 @@
 %define couchdb_group couchdb
 %define couchdb_home %{_localstatedir}/lib/couchdb
 Name:           couchdb
-Version:        0.8.1
-Release:        4%{?dist}
+Version:        0.9.0
+Release:        1%{?dist}
 Summary:        A document database server, accessible via a RESTful JSON API
 
 Group:          Applications/Databases
 License:        ASL 2.0
 URL:            http://incubator.apache.org/couchdb/
-Source0:        http://www.apache.org/dist/incubator/%{name}/%{version}-incubating/%{tarname}-%{version}-incubating.tar.gz
+Source0:        http://www.apache.org/dist/%{name}/%{version}/%{tarname}-%{version}.tar.gz
 Source1:        %{name}.init
+Patch0:         couchdb-0.9.0-pid.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  erlang 
 BuildRequires:  libicu-devel 
 BuildRequires:  js-devel 
 BuildRequires:  help2man
+BuildRequires:  libcurl-devel
 Requires:       erlang 
 #Requires:       %{_bindir}/icu-config
 Requires:       libicu-devel
@@ -39,7 +41,8 @@ queryable and indexable using a table-or
 JavaScript acting as the default view definition language.
 
 %prep
-%setup -q -n %{tarname}-%{version}-incubating
+%setup -q -n %{tarname}-%{version}
+%patch0 -p1 -b .pid
 
 
 %build
@@ -51,7 +54,7 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# Install couchdb initscript
+## Install couchdb initscript
 install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
 
 # Create /var/log/couchdb
@@ -63,18 +66,15 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir
 # Create /var/lib/couchdb
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/couchdb
 
-# Use /etc/sysconfig instead of /etc/default
+## Use /etc/sysconfig instead of /etc/default
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 mv $RPM_BUILD_ROOT%{_sysconfdir}/default/couchdb \
 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/couchdb
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/default
 
-sed -i 's/\/var\/run\/couchdb.pid/\%{_localstatedir}\/run\/couchdb\/couchdb.pid/g' \
-$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/couchdb
-
 # Remove unecessary files
 rm $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/couchdb
-rm $RPM_BUILD_ROOT%{_libdir}/couchdb/erlang/lib/couch-0.8.1-incubating/priv/lib/couch_erl_driver.la
+rm $RPM_BUILD_ROOT%{_libdir}/couchdb/erlang/lib/couch-0.9.0/priv/lib/couch_erl_driver.la
 rm -rf  $RPM_BUILD_ROOT%{_datadir}/doc/couchdb
 
 
@@ -109,10 +109,12 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS CHANGES LICENSE NEWS NOTICE README THANKS
 %dir %{_sysconfdir}/couchdb
-%config(noreplace) %{_sysconfdir}/couchdb/couch.ini
+%config(noreplace) %{_sysconfdir}/couchdb/default.ini
+%config(noreplace) %{_sysconfdir}/couchdb/local.ini
 #%config(noreplace) %{_sysconfdir}/default/couchdb
 %config(noreplace) %{_sysconfdir}/sysconfig/couchdb
 %config(noreplace) %{_sysconfdir}/logrotate.d/couchdb
+#%config %{_sysconfdir}/rc.d/couchdb
 %{_initrddir}/couchdb
 %{_bindir}/*
 %{_libdir}/couchdb
@@ -123,6 +125,9 @@ fi
 %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/lib/couchdb
 
 %changelog
+* Tue Apr 21 2009 Allisson Azevedo <allisson at gmail.com> 0.9.0-1
+- Update to 0.9.0.
+
 * Tue Nov 25 2008 Allisson Azevedo <allisson at gmail.com> 0.8.1-4
 - Use /etc/sysconfig for settings.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	3 Mar 2009 00:25:31 -0000	1.1
+++ import.log	7 May 2009 01:24:36 -0000	1.2
@@ -1 +1,2 @@
 couchdb-0_8_1-4_fc10:HEAD:couchdb-0.8.1-4.fc10.src.rpm:1236039841
+couchdb-0_9_0-1_fc10:F-11:couchdb-0.9.0-1.fc10.src.rpm:1241659387


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Mar 2009 00:25:31 -0000	1.2
+++ sources	7 May 2009 01:24:36 -0000	1.3
@@ -1 +1 @@
-89e037b370bef33be93f0f317e07615f  apache-couchdb-0.8.1-incubating.tar.gz
+16526c807ae8a455a0a4feb50d0357eb  apache-couchdb-0.9.0.tar.gz