Hello community, here is the log from the commit of package couchdb for openSUSE:Factory checked in at 2012-08-04 09:08:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/couchdb (Old) and /work/SRC/openSUSE:Factory/.couchdb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "couchdb", Maintainer is "CThiel@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/couchdb/couchdb.changes 2012-06-15 14:04:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.couchdb.new/couchdb.changes 2012-08-04 09:10:40.000000000 +0200 @@ -1,0 +2,25 @@ +Mon Jul 30 14:32:12 UTC 2012 - saschpe@suse.de + +- BuildRequire js-devel (already in openSUSE) instead of libjs-devel + (only in server:database) + +------------------------------------------------------------------- +Tue Jul 24 11:17:02 UTC 2012 - saschpe@suse.de + +- Set login shell of user couchdb to /bin/false +- Create /var/run/couchdb in %post and %ghost it (tmpfs) + +------------------------------------------------------------------- +Fri Jul 13 14:56:07 UTC 2012 - jatan@suse.de + +- Add init and sysconfig scripts from IBS Devel:Cloud, so that CouchDB + actually starts when installed + +------------------------------------------------------------------- +Thu Jul 12 16:14:55 UTC 2012 - dmacvicar@suse.de + +- remove all xulrunner support + without the rpath patch was already not working +- add --enable-js-trunk to build with newer libjs + +------------------------------------------------------------------- New: ---- couchdb.sysconfig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ couchdb.spec ++++++ --- /var/tmp/diff_new_pack.NZdeby/_old 2012-08-04 09:10:56.000000000 +0200 +++ /var/tmp/diff_new_pack.NZdeby/_new 2012-08-04 09:10:56.000000000 +0200 @@ -21,18 +21,6 @@ %define couchdb_group couchdb %define couchdb_home %{_localstatedir}/lib/couchdb -%define xul_version 192 -%define xul_pathext / - -%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: 1.2.0 Release: 0 @@ -42,39 +30,26 @@ Url: http://couchdb.apache.org/ Source0: http://www.apache.org/dist/%{name}/releases/%{version}/apache-couchdb-%{version}.tar.gz Source1: %{name}.init +Source2: %{name}.sysconfig 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 %suse_version > 1210 -BuildRequires: js-devel -BuildRequires: xulrunner-devel -%else -BuildRequires: mozilla-xulrunner%{xul_version}-devel -%endif BuildRequires: pkgconfig Requires: erlang -#Requires: %%{_bindir}/icu-config -#Requires: libicu-devel -# Require the proper mozilla-js (do not rely on the autoprovreq found libmozjs) -%if 0%{?suse_version} > 1210 -Requires: js -%else -%if 0%{?suse_version} < 1130 -Requires: mozilla-xulrunner%{xul_version} -%else -Requires: mozilla-js%{xul_version} -%endif -%endif Requires: logrotate Requires(post): aaa_base 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 Apache CouchDB is a distributed, fault-tolerant and schema-free @@ -86,25 +61,32 @@ %prep %setup -q -n apache-couchdb-%{version} -#%patch0 -p1 %build -#autoreconf -fi +autoreconf -fi + +# Versions of SpiderMonkey after the js185-1.0.0 release remove the optional +# enforcement of preventing anonymous functions in a statement context. This +# will most likely break your existing JavaScript code as well as render all +# example code invalid. +# If you wish to ignore this error pass --enable-js-trunk to ./configure. +# # 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 mozjs185) \ - --with-js-lib=$(pkg-config --variable=libdir mozjs185) +%configure --enable-js-trunk make %{?_smp_mflags} %install -%make_install +%makeinstall ## Install couchdb initscript install -D -m 0755 %{SOURCE1} %{buildroot}%{_initddir}/%{name} install -d %{buildroot}%{_sbindir} ln -s %{_initddir}/couchdb %{buildroot}%{_sbindir}/rccouchdb +# Sysconfig template +mkdir -p %{buildroot}%{_var}/adm/fillup-templates/ +install -p -D -m 644 %{SOURCE2} %{buildroot}%{_var}/adm/fillup-templates/sysconfig.couchdb # Create needed directories -install -d %{buildroot}%{_localstatedir}/{log,run,lib}/couchdb +install -d %{buildroot}%{_localstatedir}/{log,lib}/couchdb install -d %{buildroot}%{_sysconfdir}/couchdb/{default.d,local.d} # Remove unecessary files rm %{buildroot}%{_sysconfdir}/rc.d/couchdb @@ -113,14 +95,14 @@ find %{buildroot} -name '*.la' -delete -print %pre -getent group %{couchdb_group} >/dev/null || groupadd -r %{couchdb_group} +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/bash \ --c "Couchdb Database Server" %{couchdb_user} -exit 0 + useradd -r -g %{couchdb_group} -d %{couchdb_home} -s /bin/nologin \ + -c "Couchdb Database Server" %{couchdb_user} || : %post %{fillup_and_insserv couchdb} +mkdir -p %{_localstatedir}/run/couchdb %postun %restart_on_update couchdb @@ -140,13 +122,14 @@ %config(noreplace) %{_sysconfdir}/default/couchdb %config(noreplace) %{_sysconfdir}/logrotate.d/couchdb %{_initddir}/couchdb +%{_var}/adm/fillup-templates/sysconfig.couchdb %{_sbindir}/rccouchdb %{_bindir}/* %{_libdir}/couchdb %{_datadir}/couchdb %{_mandir}/man1/* %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/log/couchdb -%dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/run/couchdb +%ghost %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/run/couchdb %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/lib/couchdb %changelog ++++++ couchdb.init ++++++ --- /var/tmp/diff_new_pack.NZdeby/_old 2012-08-04 09:10:56.000000000 +0200 +++ /var/tmp/diff_new_pack.NZdeby/_new 2012-08-04 09:10:56.000000000 +0200 @@ -26,8 +26,14 @@ rc_reset COUCHDB_BIN="/usr/bin/couchdb" -config="/etc/sysconfig/couchdb" +COUCHDB_USER="couchdb" +COUCHDB_INIT_FILE="/var/log/couchdb/couchdb.init" +COUCHDB_STDOUT_FILE="/dev/null" +COUCHDB_STDERR_FILE="/var/log/couchdb/couchdb.stderr" +COUCHDB_RESPAWN_TIMEOUT=5 +export HOME=/var/lib/couchdb +config="/etc/sysconfig/couchdb" [ -e $config ] && . $config lockfile=/var/lock/subsys/couchdb @@ -38,12 +44,17 @@ case "$1" in start) echo -n "Starting CouchDB" - sudo -u couchdb $COUCHDB_BIN -b -o /var/log/couchdb/couchdb.stdout -e /var/log/couchdb/couchdb.stderr > /dev/null 2>&1 + [ -n "$COUCHDB_RESPAWN_TIMEOUT" ] && respawn="-r $COUCHDB_RESPAWN_TIMEOUT" + startproc -s -u $COUCHDB_USER $COUCHDB_BIN -b \ + -o $COUCHDB_STDOUT_FILE \ + -e $COUCHDB_STDERR_FILE \ + $respawn \ + $COUCHDB_OPTIONS >> $COUCHDB_INIT_FILE 2>&1 rc_status -v ;; stop) echo -n "Stopping CouchDB" - sudo -u couchdb $COUCHDB_BIN -d > /dev/null 2>&1 + sudo -u $COUCHDB_USER $COUCHDB_BIN -d >> $COUCHDB_INIT_FILE 2>&1 rc_status -v ;; restart|force-reload) @@ -53,7 +64,7 @@ ;; status) echo -n "Checking for CouchDB" - sudo -u couchdb $COUCHDB_BIN -s > /dev/null 2>&1 || rc_failed 3 + sudo -u $COUCHDB_USER $COUCHDB_BIN -s >> $COUCHDB_INIT_FILE 2>&1 || rc_failed 3 rc_status -v ;; condrestart|try-restart) ++++++ couchdb.sysconfig ++++++ ## Type: string ## Default: "couchdb" # # User the process runs as. # Don't change this unless you know what you are doing # COUCHDB_USER=couchdb ## Type: string ## Default: "/var/log/couchdb/couchdb.init" # # Standard output/error for the CouchDb init script # Don't change this unless you know what you are doing # COUCHDB_INIT_FILE=/var/log/couchdb/couchdb.init ## Type: string ## Default: "/dev/null" # # Standard output for the CouchDb process # Don't change this unless you know what you are doing # COUCHDB_STDOUT_FILE=/dev/null ## Type: string ## Default: "/var/log/couchdb/couchdb.stderr" # # Standard error for the CouchDb process # Don't change this unless you know what you are doing # COUCHDB_STDERR_FILE=/var/log/couchdb/couchdb.stderr ## Type: integer(0:) ## Default: 5 # # Respawn timeout # COUCHDB_RESPAWN_TIMEOUT=5 ## Type: string ## Default: "" # # Other options to pass to the server process # COUCHDB_OPTIONS= -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org