Hello community, here is the log from the commit of package couchdb for openSUSE:Factory checked in at Fri Apr 16 00:05:27 CEST 2010. -------- --- couchdb/couchdb.changes 2010-04-07 11:50:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/couchdb/couchdb.changes 2010-04-09 22:55:38.000000000 +0200 @@ -1,0 +2,15 @@ +Fri Apr 9 20:54:24 UTC 2010 - dimstar@opensuse.org + +- Add couchdb-autotools.patch: autoreconf now does no longer fail + on older openSUSE releases. + +------------------------------------------------------------------- +Fri Apr 9 18:30:29 UTC 2010 - dimstar@opensuse.org + +- Build against xulrunner 1.9.1 on openSUSE 11.2, otherwise build + against xulrunner 1.9.2; until xulrunner 1.9.1, mozjs headers + resided in unstable. +- Add couchdb-mozjs-rpath.patch: our mozjs.so lives outside of + LD_LIBRARY_PATH and we require the proper -rpath for this. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- couchdb-autotools.patch couchdb-mozjs-rpath.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ couchdb.spec ++++++ --- /var/tmp/diff_new_pack.7hvZqI/_old 2010-04-16 00:04:24.000000000 +0200 +++ /var/tmp/diff_new_pack.7hvZqI/_new 2010-04-16 00:04:24.000000000 +0200 @@ -22,9 +22,18 @@ %define couchdb_group couchdb %define couchdb_home %{_localstatedir}/lib/couchdb +%if 0%{suse_version} == 1120 +%define xul_version 191 +%define xul_pathext /unstable +%endif +%if 0%{suse_version} == 1130 +%define xul_version 192 +%define xul_pathext / +%endif + Name: couchdb Version: 0.11.0 -Release: 1 +Release: 2 Summary: A document database server, accessible via a RESTful JSON API License: ASL 2.0 @@ -32,13 +41,17 @@ Group: Productivity/File utilities Source0: http://www.apache.org/dist/%{name}/%{version}/%{tarname}-%{version}.tar.bz2 Source1: %{name}.init +# PATCH-FIX-UPSTREAM couchdb-mozjs-rpath.patch dimstar@opensuse.org -- couchdb does not honor mozjs' libflags from the .pc file. +Patch0: couchdb-mozjs-rpath.patch +# PATCH-FIX-UPSTREAM couchdb-autotools.patch dimstar@opensuse.org -- Fix autoreconf capability by properly specifying the m4 source. +Patch1: couchdb-autotools.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: erlang BuildRequires: help2man BuildRequires: libcurl-devel BuildRequires: libicu-devel -BuildRequires: mozilla-xulrunner191-devel +BuildRequires: mozilla-xulrunner%{xul_version}-devel BuildRequires: pkgconfig Requires: erlang @@ -63,12 +76,15 @@ %prep %setup -q -n %{tarname}-%{version} +%patch0 -p1 +%patch1 -p1 %build +autoreconf -fi # We need to define the use of gnu99 standard. It seems expected in the code, but not passed. export CFLAGS="%{optflags} -std=gnu99" %configure \ - --with-js-include=$(pkg-config --variable=includedir mozilla-js)/unstable \ + --with-js-include=$(pkg-config --variable=includedir mozilla-js)%{xul_pathext} \ --with-js-lib=$(pkg-config --variable=libdir mozilla-js) make %{?jobs:-j%jobs} ++++++ couchdb-autotools.patch ++++++ Index: apache-couchdb-0.11.0/Makefile.am =================================================================== --- apache-couchdb-0.11.0.orig/Makefile.am +++ apache-couchdb-0.11.0/Makefile.am @@ -10,6 +10,8 @@ ## License for the specific language governing permissions and limitations under ## the License. +ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = bin etc src share test var utils localdoc_DATA = \ ++++++ couchdb-mozjs-rpath.patch ++++++ Index: apache-couchdb-0.11.0/src/couchdb/priv/Makefile.am =================================================================== --- apache-couchdb-0.11.0.orig/src/couchdb/priv/Makefile.am +++ apache-couchdb-0.11.0/src/couchdb/priv/Makefile.am @@ -46,7 +46,7 @@ COUCHJS_SRCS = \ locallibbin_PROGRAMS = couchjs couchjs_SOURCES = $(COUCHJS_SRCS) -couchjs_LDFLAGS = $(CURL_LDFLAGS) +couchjs_LDFLAGS = $(CURL_LDFLAGS) -Wl,-rpath,@JS_LIB_DIR@ couchjs_CFLAGS = $(CURL_CFLAGS) couchjs_LDADD = $(CURL_LDFLAGS) @JSLIB@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org