Hello community,
here is the log from the commit of package tomcat for openSUSE:Factory checked
in at 2013-01-03 13:48:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tomcat (Old)
and /work/SRC/openSUSE:Factory/.tomcat.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tomcat", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/tomcat/tomcat.changes 2012-12-19
13:31:40.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.tomcat.new/tomcat.changes 2013-01-03
13:48:30.000000000 +0100
@@ -1,0 +2,16 @@
+Thu Dec 27 17:14:55 UTC 2012 - arc...@dellroad.org
+
+- Ensure tomcat stdout/stderr output ends up in catalina.out
+
+-------------------------------------------------------------------
+Thu Dec 20 22:45:19 UTC 2012 - arc...@dellroad.org
+
+- Recommend libtcnative-1-0 >= 1.1.24
+- /etc/init.d/tomcate init script fixes:
+ * Include /usr/bin and /usr/sbin in the PATH
+ * Fix logic for cleaning the work directories
+ * Fix typo (log_success_msg lsb function name)
+ * Fix typo (reload message)
+- Require log4j
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tomcat.spec ++++++
--- /var/tmp/diff_new_pack.6t2Mpd/_old 2013-01-03 13:48:31.000000000 +0100
+++ /var/tmp/diff_new_pack.6t2Mpd/_new 2013-01-03 13:48:31.000000000 +0100
@@ -112,7 +112,7 @@
BuildRequires: systemd
%endif
-Recommends: libtcnative-1-0
+Recommends: libtcnative-1-0 >= 1.1.24
Recommends: logrotate
Requires(pre): %{_sbindir}/groupadd
@@ -122,6 +122,7 @@
Requires: jakarta-commons-dbcp
Requires: jakarta-commons-logging
Requires: jakarta-commons-pool
+Requires: log4j
%{?systemd_requires}
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
++++++ tomcat-7.0-tomcat-sysd ++++++
--- /var/tmp/diff_new_pack.6t2Mpd/_old 2013-01-03 13:48:31.000000000 +0100
+++ /var/tmp/diff_new_pack.6t2Mpd/_new 2013-01-03 13:48:31.000000000 +0100
@@ -77,7 +77,8 @@
-Djava.io.tmpdir="$CATALINA_TMPDIR" ${DSECURITY_MANAGER} \
-Djava.util.logging.config.file="${CATALINA_BASE}/conf/logging.properties" \
-Djava.util.logging.manager="org.apache.juli.ClassLoaderLogManager" \
- org.apache.catalina.startup.Bootstrap start
+ org.apache.catalina.startup.Bootstrap start \
+ >> ${CATALINA_BASE}/logs/catalina.out 2>&1
ret=${?}
return $ret
++++++ tomcat-7.0.init ++++++
--- /var/tmp/diff_new_pack.6t2Mpd/_old 2013-01-03 13:48:31.000000000 +0100
+++ /var/tmp/diff_new_pack.6t2Mpd/_new 2013-01-03 13:48:31.000000000 +0100
@@ -27,7 +27,7 @@
### END INIT INFO
# set a minimalist PATH
-PATH="/bin:/sbin"
+PATH="/bin:/sbin:/usr/bin:/usr/sbin"
# Source LSB function library.
if [ -r /lib/lsb/init-functions ]; then
@@ -304,11 +304,9 @@
rm -f /var/run/rc${NAME} /var/run/${NAME}.pid
if [ "${CLEAR_WORK}" = "true" ]; then
echo -n "Cleaning work directory: "
- #rm -rf ${CATALINA_HOME}/work/*
- find ${CATALINA_HOME}/work/ -maxdepth 1 -type 'd' \! -name
'Catalina' \! -name 'temp' -print0 | xargs -0 rm -rf
- find ${CATALINA_HOME}/work/Catalina/
${CATALINA_HOME}/work/temp/ -print0 | xargs -0 rm -rf
+ find ${CATALINA_HOME}/work/{Catalina,temp} -mindepth 2 -type d
-print0 | xargs -0 rm -rf
if [ "$?" -eq "0" ]; then
- echo_success
+ log_success_msg
echo -n -e "\n"
fi
fi
@@ -349,7 +347,7 @@
## do this on signal 1 (SIGHUP).
## If it does not support it, restart.
- echo -n "Reload service Tomcat $($CATALINA_BASE)"
+ echo -n "Reload service Tomcat ($CATALINA_BASE)"
## if it supports it:
#killproc -HUP $TOMCAT_BIN
#touch /var/run/FOO.pid
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
