diff --git a/couchdb-0.10.0-initenabled.patch b/couchdb-0.10.0-initenabled.patch new file mode 100644 index 0000000..ceac52a --- /dev/null +++ b/couchdb-0.10.0-initenabled.patch @@ -0,0 +1,26 @@ +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 diff --git a/couchdb.spec b/couchdb.spec index 65c07e6..e1bb76b 100644 --- a/couchdb.spec +++ b/couchdb.spec @@ -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 definition language. %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 0.10.0-2 +- Added patch to force init_enabled=true in configure.ac. + * Thu Oct 15 2009 Allisson Azevedo 0.10.0-1 - Update to 0.10.0. diff --git a/import.log b/import.log index 64f1af0..cfcc0e4 100644 --- a/import.log +++ b/import.log @@ -3,3 +3,4 @@ couchdb-0_9_0-1_fc10:HEAD:couchdb-0.9.0-1.fc10.src.rpm:1241659193 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