packages: apache-couchdb/apache-couchdb.spec, apache-couchdb/apache-couchdb...

Mon Nov 2 23:33:28 CET 2009

Author: zergin                       Date: Mon Nov  2 22:33:28 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.10.0 (not incubating any more)
- add aclocal patch
- builds and packed - dunno if runs 

---- Files affected:
packages/apache-couchdb:
   apache-couchdb.spec (1.2 -> 1.3) , apache-couchdb-aclocal.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/apache-couchdb/apache-couchdb.spec
diff -u packages/apache-couchdb/apache-couchdb.spec:1.2 packages/apache-couchdb/apache-couchdb.spec:1.3

--- packages/apache-couchdb/apache-couchdb.spec:1.2	Mon Nov  3 13:51:33 2008
+++ packages/apache-couchdb/apache-couchdb.spec	Mon Nov  2 23:33:22 2009
@@ -1,17 +1,21 @@
+%define _mochiwebver r97
+%define _ibrowsever 1.5.2
+
 # $Revision$, $Date$
 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
@@ -24,7 +28,7 @@
 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
@@ -43,10 +47,12 @@
 the default view definition language.
 
 %prep
-%setup -q -n %{name}-%{version}-incubating
+%setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
+
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -55,6 +61,7 @@
 %configure
 %{__make}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} install \
@@ -88,7 +95,10 @@
 %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
@@ -108,20 +118,27 @@
 %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
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -130,6 +147,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2009/11/02 22:33:22  zergin
+- up to 0.10.0 (not incubating any more)
+- add aclocal patch
+- builds and packed - dunno if runs
+
 Revision 1.2  2008/11/03 12:51:33  glen
 - packaged something
 

================================================================
Index: packages/apache-couchdb/apache-couchdb-aclocal.patch
diff -u /dev/null packages/apache-couchdb/apache-couchdb-aclocal.patch:1.1
--- /dev/null	Mon Nov  2 23:33:28 2009
+++ packages/apache-couchdb/apache-couchdb-aclocal.patch	Mon Nov  2 23:33:22 2009
@@ -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)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-couchdb/apache-couchdb.spec?r1=1.2&r2=1.3&f=u

