- up to 0.10.0 (not incubating any more)

- add aclocal patch
- builds and packed - dunno if runs

Changed files:
    apache-couchdb-aclocal.patch -> 1.1
    apache-couchdb.spec -> 1.3

diff --git a/apache-couchdb-aclocal.patch b/apache-couchdb-aclocal.patch
new file mode 100644 (file)
index 0000000..136aae1
--- /dev/null
+++ b/apache-couchdb-aclocal.patch
@@ -0,0 +1,31 @@
+diff -ur apache-couchdb-0.10.0/configure.ac mod/configure.ac
+--- apache-couchdb-0.10.0/configure.ac 2009-09-30 05:04:15.000000000 +0200
++++ mod/configure.ac   2009-11-02 23:10:04.811654170 +0100
+@@ -11,6 +11,7 @@
+ dnl under the License.
+ 
+ m4_include([m4/ac_check_icu.m4])
++m4_include([m4/ac_check_curl.m4])
+ 
+ AC_INIT([LOCAL_PACKAGE_NAME], [LOCAL_VERSION], [], [LOCAL_PACKAGE_TARNAME])
+ 
+@@ -18,6 +19,7 @@
+ 
+ AC_CONFIG_SRCDIR([CHANGES])
+ AC_CONFIG_AUX_DIR([build-aux])
++AC_CONFIG_MACRO_DIR([m4])
+ 
+ AM_CONFIG_HEADER([config.h])
+ 
+diff -ur apache-couchdb-0.10.0/Makefile.am mod/Makefile.am
+--- apache-couchdb-0.10.0/Makefile.am  2009-10-08 06:17:52.000000000 +0200
++++ mod/Makefile.am    2009-11-02 23:10:29.278320255 +0100
+@@ -12,6 +12,8 @@
+ 
+ SUBDIRS = bin etc src share test var utils
+ 
++ACLOCAL_AMFLAGS = -I m4
++
+ localdoc_DATA = AUTHORS.gz BUGS.gz CHANGES.gz NEWS.gz README.gz THANKS.gz
+ 
+ DISTCLEANFILES = $(localdoc_DATA)

diff --git a/apache-couchdb.spec b/apache-couchdb.spec
index 97996e3f7a035a020dccdc5c7a8ed51dced05125..7725b36f5d368d81ab29f6e86d29449fe0ab8218 100644 (file)
--- a/apache-couchdb.spec
+++ b/apache-couchdb.spec
@@ -1,16 +1,20 @@
+%define _mochiwebver r97
+%define _ibrowsever 1.5.2
+
 Summary:       Apache CouchDB
 Name:          apache-couchdb
-Version:       0.8.1
+Version:       0.10.0
 Release:       0.1
 License:       Apache v2.0
 Group:         Applications
-Source0:       http://www.apache.org/dist/incubator/couchdb/%{version}-incubating/%{name}-%{version}-incubating.tar.gz
-# Source0-md5: 89e037b370bef33be93f0f317e07615f
+Source0:       http://www.apache.org/dist/couchdb/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 227886b5ecbb6bcbbdc538aac4592b0e
 Patch0:                %{name}-init.d.patch
-URL:           http://incubator.apache.org/couchdb/
+Patch1:                %{name}-aclocal.patch
+URL:           http://couchdb.apache.org/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1.6.3
-BuildRequires: erlang >= 1:R11B
+BuildRequires: erlang >= 1:R12B5
 BuildRequires: help2man
 BuildRequires: js-devel
 BuildRequires: libicu-devel
@@ -23,7 +27,7 @@ Requires(pre):        /bin/id
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
-Requires:      erlang >= 1:R11B
+Requires:      erlang >= 1:R12B5
 # these came from readme, need to check if these are really needed
 #Requires:     Mozilla-SpiderMonkey
 #Requires:     gcc
@@ -42,10 +46,12 @@ indexable using a table-oriented view engine with JavaScript acting as
 the default view definition language.
 
 %prep
-%setup -q -n %{name}-%{version}-incubating
+%setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
+
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -54,6 +60,7 @@ the default view definition language.
 %configure
 %{__make}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} install \
@@ -87,7 +94,10 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS BUGS CHANGES NEWS NOTICE README THANKS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/couchdb/couch.ini
+%dir %{_sysconfdir}/couchdb/default.d
+%dir %{_sysconfdir}/couchdb/local.d
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/couchdb/default.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/couchdb/local.ini
 # XXX -> sysconfdir
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/default/couchdb
 %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/couchdb
@@ -107,18 +117,25 @@ fi
 %dir %{_libdir}/couchdb/erlang
 %dir %{_libdir}/couchdb/erlang/lib
 # XXX: better have unversioned dirs?
-%dir %{_libdir}/couchdb/erlang/lib/couch-%{version}-incubating
-%dir %{_libdir}/couchdb/erlang/lib/couch-%{version}-incubating/ebin
-%{_libdir}/couchdb/erlang/lib/couch-%{version}-incubating/ebin/*.beam
-%{_libdir}/couchdb/erlang/lib/couch-%{version}-incubating/ebin/*.app
+%dir %{_libdir}/couchdb/erlang/lib/couch-%{version}
+%dir %{_libdir}/couchdb/erlang/lib/couch-%{version}/ebin
+%{_libdir}/couchdb/erlang/lib/couch-%{version}/ebin/*.beam
+%{_libdir}/couchdb/erlang/lib/couch-%{version}/ebin/*.app
 # XXX check if this include is needed runtime
-%{_libdir}/couchdb/erlang/lib/couch-%{version}-incubating/include/couch_db.hrl
+%{_libdir}/couchdb/erlang/lib/couch-%{version}/include/couch_db.hrl
 # XXX: check if .la is needed
-%{_libdir}/couchdb/erlang/lib/couch-%{version}-incubating/priv/lib/couch_erl_driver.la
-%attr(755,root,root) %{_libdir}/couchdb/erlang/lib/couch-%{version}-incubating/priv/lib/couch_erl_driver.so
+%{_libdir}/couchdb/erlang/lib/couch-%{version}/priv/couchspawnkillable
+%{_libdir}/couchdb/erlang/lib/couch-%{version}/priv/lib/couch_erl_driver.la
+%attr(755,root,root) %{_libdir}/couchdb/erlang/lib/couch-%{version}/priv/lib/couch_erl_driver.so
+
 # XXX: better have unversioned dirs?
-%dir %{_libdir}/couchdb/erlang/lib/mochiweb-r82
-%dir %{_libdir}/couchdb/erlang/lib/mochiweb-r82/ebin
-%{_libdir}/couchdb/erlang/lib/mochiweb-r82/ebin/*.beam
-%{_libdir}/couchdb/erlang/lib/mochiweb-r82/ebin/*.app
+%dir %{_libdir}/couchdb/erlang/lib/mochiweb-%{_mochiwebver}
+%dir %{_libdir}/couchdb/erlang/lib/mochiweb-%{_mochiwebver}/ebin
+%{_libdir}/couchdb/erlang/lib/mochiweb-%{_mochiwebver}/ebin/*.beam
+%{_libdir}/couchdb/erlang/lib/mochiweb-%{_mochiwebver}/ebin/*.app
+
+%{_libdir}/couchdb/erlang/lib/etap/ebin
+%{_libdir}/couchdb/erlang/lib/erlang-oauth/ebin
+%{_libdir}/couchdb/erlang/lib/ibrowse-%{_ibrowsever}/ebin
+
 %{_datadir}/couchdb