Hello community, here is the log from the commit of package tomcat6 for openSUSE:Factory checked in at Mon Aug 29 17:12:38 CEST 2011. -------- --- tomcat6/tomcat6.changes 2011-02-11 09:31:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/tomcat6/tomcat6.changes 2011-08-29 15:37:08.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Aug 29 13:33:51 UTC 2011 - mvyskocil@suse.cz + +- update to latest upstream version 6.0.33 (bugfix release) +- fix bnc#714620 - tomcat6: use of /var/lock/subsys unsupported + use /var/run/rctomcat6 instead + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- apache-tomcat-6.0.32-src.tar.bz2 New: ---- apache-tomcat-6.0.33-src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libtcnative-1-0.spec ++++++ --- /var/tmp/diff_new_pack.XnZ6oP/_old 2011-08-29 17:11:58.000000000 +0200 +++ /var/tmp/diff_new_pack.XnZ6oP/_new 2011-08-29 17:11:58.000000000 +0200 @@ -29,7 +29,7 @@ Name: libtcnative-1-0 Version: %{major}.%{minor}.%{micro} -Release: 11 +Release: 12 Summary: JNI wrappers for Apache Portable Runtime for Tomcat Group: Productivity/Networking/Web/Servers License: Apache Software License .. ++++++ tomcat6.spec ++++++ --- /var/tmp/diff_new_pack.XnZ6oP/_old 2011-08-29 17:11:58.000000000 +0200 +++ /var/tmp/diff_new_pack.XnZ6oP/_new 2011-08-29 17:11:58.000000000 +0200 @@ -22,7 +22,7 @@ %define jspspec 2.1 %define major_version 6 %define minor_version 0 -%define micro_version 32 +%define micro_version 33 %define packdname apache-tomcat-%{version}-src %define servletspec 2.5 %define elspec 1.0 @@ -46,7 +46,7 @@ Group: Productivity/Networking/Web/Servers License: Apache Software License .. Url: http://tomcat.apache.org -Source0: http://www.apache.org/dist/tomcat/tomcat-6/v%{version}/src/%{packdname}.tar.bz2 +Source0: http://www.apache.org/dist/tomcat/tomcat-6/v%{version}/src/%{packdname}.tar.gz Source1: %{name}-%{major_version}.%{minor_version}.conf Source2: %{name}-%{major_version}.%{minor_version}.init # sysconfig removal - bnc#471639 ++++++ tomcat6-6.0.init ++++++ --- /var/tmp/diff_new_pack.XnZ6oP/_old 2011-08-29 17:11:58.000000000 +0200 +++ /var/tmp/diff_new_pack.XnZ6oP/_new 2011-08-29 17:11:58.000000000 +0200 @@ -199,7 +199,7 @@ # See how we were called. function start() { echo -n "Starting Tomcat ($CATALINA_BASE)" - if [ -f "/var/lock/subsys/${NAME}" ] ; then + if [ -f "/var/run/rc${NAME}" ] ; then if [ -f "/var/run/${NAME}.pid" ]; then read kpid < /var/run/${NAME}.pid if checkpid $kpid 2>&1; then @@ -237,7 +237,7 @@ RETVAL="$?" if [ "$RETVAL" -eq 0 ]; then rc_failed 0 - touch /var/lock/subsys/${NAME} + touch /var/run/rc${NAME} else rc_failed 7 fi @@ -279,7 +279,7 @@ function stop() { echo -n "Shutting down Tomcat ($CATALINA_BASE)" - if [ -f "/var/lock/subsys/${NAME}" ]; then + if [ -f "/var/run/rc${NAME}" ]; then parseOptions $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} stop" >> $TOMCAT_LOG 2>&1 RETVAL="$?" @@ -308,7 +308,7 @@ echo -n -e "\n" fi fi - rm -f /var/lock/subsys/${NAME} /var/run/${NAME}.pid + 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/* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org