From b212fdc3463166f10b1b99335dda9d732d0f2ef7 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: May 07 2010 13:49:11 +0000 Subject: Ver. 0.10.2 --- diff --git a/.cvsignore b/.cvsignore index edefd8f..18183eb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -apache-couchdb-0.10.0.tar.gz +apache-couchdb-0.10.2.tar.gz diff --git a/couchdb.init b/couchdb.init index 080aa0a..f70ca47 100644 --- a/couchdb.init +++ b/couchdb.init @@ -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. diff --git a/couchdb.spec b/couchdb.spec index 30542d1..1384c8f 100644 --- a/couchdb.spec +++ b/couchdb.spec @@ -2,9 +2,10 @@ %define couchdb_user couchdb %define couchdb_group couchdb %define couchdb_home %{_localstatedir}/lib/couchdb + Name: couchdb -Version: 0.10.0 -Release: 3%{?dist} +Version: 0.10.2 +Release: 1%{?dist} Summary: A document database server, accessible via a RESTful JSON API Group: Applications/Databases @@ -12,18 +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}-%{version}-initenabled.patch +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 @@ -45,6 +47,7 @@ JavaScript acting as the default view definition language. %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 @@ -127,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 @@ -141,6 +142,10 @@ fi %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/lib/couchdb %changelog +* Fri May 7 2010 Peter Lemenkov 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 0.10.0-3 - rebuild for icu 4.4 diff --git a/import.log b/import.log index cfcc0e4..d6160a6 100644 --- a/import.log +++ b/import.log @@ -4,3 +4,4 @@ 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 +couchdb-0_10_2-1_fc12:HEAD:couchdb-0.10.2-1.fc12.src.rpm:1273240101 diff --git a/sources b/sources index 98fc015..b7f5ec9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -227886b5ecbb6bcbbdc538aac4592b0e apache-couchdb-0.10.0.tar.gz +d24aad80bea950ec6795f8a0cd378f3c apache-couchdb-0.10.2.tar.gz