Hello community, here is the log from the commit of package couchdb for openSUSE:Factory checked in at 2013-01-20 12:05:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/couchdb (Old) and /work/SRC/openSUSE:Factory/.couchdb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "couchdb", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/couchdb/couchdb.changes 2012-08-04 09:10:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.couchdb.new/couchdb.changes 2013-01-20 12:05:36.000000000 +0100 @@ -1,0 +2,38 @@ +Wed Jan 9 16:11:08 CET 2013 - [email protected] + +- Fix path to nologin in useradd (bnc#796242). + +------------------------------------------------------------------- +Fri Jan 4 16:15:39 UTC 2013 - [email protected] + +- Fix a futon bug when saving view code of design documents that + do not define the "language" property. The CouchDB server treats + them as "javascript" views, so the same behavior has been added + to the futon. + +------------------------------------------------------------------- +Fri Dec 7 15:21:11 UTC 2012 - [email protected] + +- Fixed LSB headers in init script to make inserv happy. CouchDB + cannot start in runlevel 2 as it requires $network. + +------------------------------------------------------------------- +Thu Nov 22 00:40:42 GMT 2012 - [email protected] + +- Use "su" instead of "sudo" in init script, else couchdb inside + screen session dies when screen terminates. + +------------------------------------------------------------------- +Mon Nov 19 13:38:34 UTC 2012 - [email protected] + +- Re-introduce js-devel BuildRequire for openSUSE-12.2 + +------------------------------------------------------------------- +Thu Nov 8 18:02:16 UTC 2012 - [email protected] + +- Replace js-devel BuildRequire with mozilla-xulrunner192-devel + (already in openSUSE) +- Remove BuildRequire curl-devel as it is not needed anymore + http://www.apache.org/dist/couchdb/notes/1.2.0/apache-couchdb-1.2.0.html + +------------------------------------------------------------------- New: ---- couchdb-futon-default-view-language.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ couchdb.spec ++++++ --- /var/tmp/diff_new_pack.Hqw81h/_old 2013-01-20 12:05:37.000000000 +0100 +++ /var/tmp/diff_new_pack.Hqw81h/_new 2013-01-20 12:05:37.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package couchdb # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,15 +31,19 @@ Source0: http://www.apache.org/dist/%{name}/releases/%{version}/apache-couchdb-%{version}.tar.gz Source1: %{name}.init Source2: %{name}.sysconfig +Patch0: couchdb-futon-default-view-language.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: automake BuildRequires: erlang BuildRequires: gcc-c++ BuildRequires: help2man -BuildRequires: js-devel -BuildRequires: libcurl-devel BuildRequires: libicu-devel BuildRequires: libtool +%if 0%{?suse_version} < 1200 +BuildRequires: mozilla-xulrunner192-devel +%else +BuildRequires: js-devel +%endif BuildRequires: pkgconfig Requires: erlang Requires: logrotate @@ -47,8 +51,6 @@ Requires(preun):aaa_base # Users and groups Requires(pre): pwdutils -# sudo is used by the init script -Requires: sudo PreReq: %insserv_prereq %fillup_prereq %description @@ -61,6 +63,7 @@ %prep %setup -q -n apache-couchdb-%{version} +%patch0 %build autoreconf -fi @@ -96,9 +99,13 @@ %pre getent group %{couchdb_group} >/dev/null || groupadd -r %{couchdb_group} || : -getent passwd %{couchdb_user} >/dev/null || \ - useradd -r -g %{couchdb_group} -d %{couchdb_home} -s /bin/nologin \ +if getent passwd %{couchdb_user} >/dev/null ; then + # There was a bad login shell up to openSUSE 12.2 (bnc#796242), SLE11SP2 used /bin/bash. Fix it. + usermod -s /usr/sbin/nologin %{couchdb_user} || : +else + useradd -r -g %{couchdb_group} -d %{couchdb_home} -s /usr/sbin/nologin \ -c "Couchdb Database Server" %{couchdb_user} || : +fi %post %{fillup_and_insserv couchdb} ++++++ couchdb-futon-default-view-language.patch ++++++ --- share/www/script/futon.browse.js.orig 2013-01-04 16:45:45.000000000 +0100 +++ share/www/script/futon.browse.js 2013-01-04 17:06:24.000000000 +0100 @@ -567,6 +567,9 @@ for (var viewName in (doc.views || {})) { if (viewName != localViewName) numViews++; } + if (doc.language === undefined) { + doc.language = 'javascript'; + } if (numViews > 0 && page.viewLanguage != doc.language) { alert("Cannot save view because the design document language " + "is \"" + doc.language + "\", not \"" + ++++++ couchdb.init ++++++ --- /var/tmp/diff_new_pack.Hqw81h/_old 2013-01-20 12:05:37.000000000 +0100 +++ /var/tmp/diff_new_pack.Hqw81h/_new 2013-01-20 12:05:37.000000000 +0100 @@ -12,8 +12,8 @@ # Required-Stop: $local_fs $network # Should-Start: $remote_fs # Should-Stop: $remote_fs -# Default-Start: 2 3 5 -# Default-Stop: 0 1 6 +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 # Short-Description: start and stop CouchDB database server # Description: Apache CouchDB is a distributed, fault-tolerant and # schema-free document-oriented database accessible @@ -64,7 +64,7 @@ ;; status) echo -n "Checking for CouchDB" - sudo -u $COUCHDB_USER $COUCHDB_BIN -s >> $COUCHDB_INIT_FILE 2>&1 || rc_failed 3 + su $COUCHDB_USER -c "$COUCHDB_BIN -s" >> $COUCHDB_INIT_FILE 2>&1 || rc_failed 3 rc_status -v ;; condrestart|try-restart) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
