rpms/couchdb/devel couchdb-0.10.0-initenabled.patch, NONE, 1.1 couchdb.spec, 1.7, 1.8 import.log, 1.5, 1.6

[Allisson Azevedo]

Author: allisson

Update of /cvs/pkgs/rpms/couchdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27835/devel

Modified Files:
	couchdb.spec import.log 
Added Files:
	couchdb-0.10.0-initenabled.patch 
Log Message:

- Added patch to force init_enabled=true in configure.ac.


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: couchdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/devel/couchdb.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- couchdb.spec	15 Oct 2009 22:40:00 -0000	1.7
+++ couchdb.spec	16 Oct 2009 00:14:25 -0000	1.8
@@ -4,7 +4,7 @@
 %define couchdb_home %{_localstatedir}/lib/couchdb
 Name:           couchdb
 Version:        0.10.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A document database server, accessible via a RESTful JSON API
 
 Group:          Applications/Databases
@@ -12,6 +12,7 @@ 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}-%{version}-initenabled.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  erlang
@@ -43,11 +44,13 @@ JavaScript acting as the default view de
 
 %prep
 %setup -q -n %{tarname}-%{version}
+%patch0 -p1 -b .initenabled
 # 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}
@@ -138,6 +141,9 @@ fi
 %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/lib/couchdb
 
 %changelog
+* 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.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	15 Oct 2009 22:40:00 -0000	1.5
+++ import.log	16 Oct 2009 00:14:25 -0000	1.6
@@ -3,3 +3,4 @@ couchdb-0_9_0-1_fc10:HEAD:couchdb-0.9.0-
 couchdb-0_9_0-2_fc10:HEAD:couchdb-0.9.0-2.fc10.src.rpm:1241742181
 couchdb-0_9_1-1_fc11:HEAD:couchdb-0.9.1-1.fc11.src.rpm:1249005969
 couchdb-0_10_0-1_fc11:HEAD:couchdb-0.10.0-1.fc11.src.rpm:1255646329
+couchdb-0_10_0-2_fc11:HEAD:couchdb-0.10.0-2.fc11.src.rpm:1255651984