rpms/couchdb/F-11 couchdb-0.10.0-initenabled.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 couchdb.init, 1.3, 1.4 couchdb.spec, 1.5, 1.6 import.log, 1.5, 1.6 sources, 1.5, 1.6

Fri May 7 13:54:15 UTC 2010

Author: peter

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

Modified Files:
	.cvsignore couchdb.init couchdb.spec import.log sources 
Added Files:
	couchdb-0.10.0-initenabled.patch 
Log Message:
Ver. 0.10.2

couchdb-0.10.0-initenabled.patch:
 configure.ac |   16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

--- NEW FILE couchdb-0.10.0-initenabled.patch ---
diff -up apache-couchdb-0.10.0/configure.ac.initenabled apache-couchdb-0.10.0/configure.ac
--- apache-couchdb-0.10.0/configure.ac.initenabled	2009-10-15 20:43:58.863638384 -0300
+++ apache-couchdb-0.10.0/configure.ac	2009-10-15 21:05:04.723374156 -0300
@@ -242,19 +242,9 @@ launchd_enabled=false
 
 if test "$use_init" = "yes"; then
    AC_MSG_CHECKING(location of init directory)
-   if test -d /etc/rc.d; then
-       init_enabled=true
-       AC_SUBST([initdir], ['${sysconfdir}/rc.d'])
-       AC_MSG_RESULT(${initdir})
-   else
-       if test -d /etc/init.d; then
-           init_enabled=true
-           AC_SUBST([initdir], ['${sysconfdir}/init.d'])
-           AC_MSG_RESULT(${initdir})
-       else
-           AC_MSG_RESULT(not found)
-       fi
-    fi
+   init_enabled=true
+   AC_SUBST([initdir], ['${sysconfdir}/rc.d'])
+   AC_MSG_RESULT(${initdir})
 fi
 
 if test "$use_launchd" = "yes"; then


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	15 Oct 2009 22:47:59 -0000	1.5
+++ .cvsignore	7 May 2010 13:54:15 -0000	1.6
@@ -1 +1 @@
-apache-couchdb-0.10.0.tar.gz
+apache-couchdb-0.10.2.tar.gz


Index: couchdb.init
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-11/couchdb.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- couchdb.init	8 May 2009 00:27:01 -0000	1.3
+++ couchdb.init	7 May 2010 13:54:15 -0000	1.4
@@ -2,7 +2,7 @@
 #
 # couchdb This is the init script for starting up the CouchDB server
 #
-# chkconfig: - 20 80
+# chkconfig: - 26 74
 # description: Starts and stops the CouchDB daemon that handles \
 #	       all database requests.
 


Index: couchdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-11/couchdb.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- couchdb.spec	15 Oct 2009 22:47:59 -0000	1.5
+++ couchdb.spec	7 May 2010 13:54:15 -0000	1.6
@@ -2,8 +2,9 @@
 %define couchdb_user couchdb
 %define couchdb_group couchdb
 %define couchdb_home %{_localstatedir}/lib/couchdb
+
 Name:           couchdb
-Version:        0.10.0
+Version:        0.10.2
 Release:        1%{?dist}
 Summary:        A document database server, accessible via a RESTful JSON API
 
@@ -12,17 +13,19 @@ License:        ASL 2.0
 URL:            http://couchdb.apache.org/
 Source0:        http://www.apache.org/dist/%{name}/%{version}/%{tarname}-%{version}.tar.gz
 Source1:        %{name}.init
+Patch0:         %{name}-0.10.0-initenabled.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  erlang
-BuildRequires:  libicu-devel 
-BuildRequires:  js-devel 
+BuildRequires:  libicu-devel
+BuildRequires:  js-devel
 BuildRequires:  help2man
-#BuildRequires:  libcurl-devel
 BuildRequires:  curl-devel
+BuildRequires:	autoconf
+BuildRequires:	libtool
 
-Requires:       erlang 
-#Requires:       %{_bindir}/icu-config
+Requires:       erlang
+# For %{_bindir}/icu-config
 Requires:       libicu-devel
 
 #Initscripts
@@ -43,11 +46,14 @@ 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
 
 
+
 %build
 %configure
 make %{?_smp_mflags}
@@ -124,10 +130,8 @@ fi
 %dir %{_sysconfdir}/couchdb/default.d
 %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
-#%config %{_sysconfdir}/rc.d/couchdb
 %{_initrddir}/couchdb
 %{_bindir}/*
 %{_libdir}/couchdb
@@ -138,13 +142,29 @@ fi
 %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/lib/couchdb
 
 %changelog
+* Fri May  7 2010 Peter Lemenkov <lemenkov at gmail.com> 0.10.2-1
+- Update to 0.10.2 (resolves rhbz #578580 and #572176)
+- Fixed chkconfig priority (see rhbz #579568)
+
+* Fri Apr 02 2010 Caolán McNamara <caolanm at redhat.com> 0.10.0-3
+- rebuild for icu 4.4
+
+* Thu Oct 15 2009 Allisson Azevedo <allisson at gmail.com> 0.10.0-2
+- Added patch to force init_enabled=true in configure.ac.
+
 * Thu Oct 15 2009 Allisson Azevedo <allisson at gmail.com> 0.10.0-1
 - Update to 0.10.0.
 
+* Sun Oct 04 2009 Rahul Sundaram <sundaram at fedoraproject.org> 0.9.1-2
+- Change url. Fixes rhbz#525949
+
 * Thu Jul 30 2009 Allisson Azevedo <allisson at gmail.com> 0.9.1-1
 - Update to 0.9.1.
 - Drop couchdb-0.9.0-pid.patch.
 
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Apr 21 2009 Allisson Azevedo <allisson at gmail.com> 0.9.0-2
 - Fix permission for ini files.
 - Fix couchdb.init start process.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-11/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	15 Oct 2009 22:47:59 -0000	1.5
+++ import.log	7 May 2010 13:54:15 -0000	1.6
@@ -3,3 +3,4 @@ couchdb-0_9_0-1_fc10:F-11:couchdb-0.9.0-
 couchdb-0_9_0-2_fc10:F-11:couchdb-0.9.0-2.fc10.src.rpm:1241742295
 couchdb-0_9_1-1_fc11:F-11:couchdb-0.9.1-1.fc11.src.rpm:1249006797
 couchdb-0_10_0-1_fc11:F-11:couchdb-0.10.0-1.fc11.src.rpm:1255646754
+couchdb-0_10_2-1_fc12:F-11:couchdb-0.10.2-1.fc12.src.rpm:1273240425


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	15 Oct 2009 22:47:59 -0000	1.5
+++ sources	7 May 2010 13:54:15 -0000	1.6
@@ -1 +1 @@
-227886b5ecbb6bcbbdc538aac4592b0e  apache-couchdb-0.10.0.tar.gz
+d24aad80bea950ec6795f8a0cd378f3c  apache-couchdb-0.10.2.tar.gz

