Hello community, here is the log from the commit of package tomcat7 for openSUSE:Factory checked in at 2012-02-25 14:12:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tomcat7 (Old) and /work/SRC/openSUSE:Factory/.tomcat7.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tomcat7", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/tomcat7/tomcat7.changes 2011-11-08 17:54:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.tomcat7.new/tomcat7.changes 2012-02-25 14:12:20.000000000 +0100 @@ -1,0 +2,12 @@ +Thu Feb 23 13:59:10 UTC 2012 - mvyskocil@suse.cz + +- update to 7.0.26 (bugfix release) +- fix bnc#747771 - don't use /var/lock/subsys + sync tomcat7 init with tomcat6 + +------------------------------------------------------------------- +Sun Feb 19 23:02:42 UTC 2012 - wittemar@googlemail.com + +- update to 7.0.25 (bugfix release) + +------------------------------------------------------------------- Old: ---- apache-tomcat-7.0.22-src.tar.gz New: ---- apache-tomcat-7.0.26-src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomcat7.spec ++++++ --- /var/tmp/diff_new_pack.vYQ5Cu/_old 2012-02-25 14:12:22.000000000 +0100 +++ /var/tmp/diff_new_pack.vYQ5Cu/_new 2012-02-25 14:12:22.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package tomcat7 # -# Copyright (c) 2010-2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2000-2009, JPackage Project # All rights reserved. # @@ -26,7 +26,7 @@ %define major_version 7 %define minor_version 0 -%define micro_version 22 +%define micro_version 26 %define packdname apache-tomcat-%{version}-src %define tcuid 91 @@ -44,10 +44,10 @@ Name: tomcat7 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1 +Release: 0 Summary: Apache Servlet/JSP Engine, RI for Servlet 3.0/JSP 2.2 API -Group: Productivity/Networking/Web/Servers License: Apache-2.0 +Group: Productivity/Networking/Web/Servers Url: http://tomcat.apache.org Source0: http://www.apache.org/dist/tomcat/tomcat-7/v%{version}/src/%{packdname}.tar.gz Source1: %{name}-%{major_version}.%{minor_version}.conf @@ -111,9 +111,8 @@ %package admin-webapps -License: Apache-2.0 -Group: Productivity/Networking/Web/Servers Summary: The host-manager and manager web applications for Apache Tomcat +Group: Productivity/Networking/Web/Servers Requires: %{name} = %{version}-%{release} %description admin-webapps @@ -122,16 +121,14 @@ %package docs-webapp -License: Apache-2.0 -Group: Productivity/Networking/Web/Servers Summary: The docs web application for Apache Tomcat +Group: Productivity/Networking/Web/Servers Requires: %{name} = %{version}-%{release} %description docs-webapp The docs web application for Apache Tomcat. %package el-2_2-api -License: Apache-2.0 Summary: Expression Language v2.2 API Group: Development/Libraries/Java Provides: %{name}-el-%{elspec}-api = %{version}-%{release} @@ -145,9 +142,8 @@ %package javadoc -License: Apache-2.0 -Group: Productivity/Networking/Web/Servers Summary: Javadoc generated documentation for Apache Tomcat +Group: Productivity/Networking/Web/Servers %description javadoc Javadoc generated documentation for Apache Tomcat. @@ -155,9 +151,8 @@ %package jsp-2_2-api -License: Apache-2.0 -Group: Productivity/Networking/Web/Servers Summary: Apache Tomcat JSP API implementation classes +Group: Productivity/Networking/Web/Servers Provides: jsp = %{jspspec} Provides: jsp22 Provides: %{name}-jsp-%{jspspec}-api @@ -171,9 +166,8 @@ %package lib -License: Apache-2.0 -Group: Productivity/Networking/Web/Servers Summary: Libraries needed to run the Tomcat Web container +Group: Productivity/Networking/Web/Servers Requires: %{name}-jsp-%{jspspec}-api = %{version}-%{release} Requires: %{name}-servlet-%{servletspec}-api = %{version}-%{release} Requires: %{name}-el-%{elspec}-api = %{version}-%{release} @@ -189,9 +183,8 @@ %package servlet-3_0-api -License: Apache-2.0 -Group: Productivity/Networking/Web/Servers Summary: Apache Tomcat Servlet API implementation classes +Group: Productivity/Networking/Web/Servers Provides: %{name}-servlet-%{servletspec}-api = %{version}-%{release} Provides: servlet = %{servletspec} Provides: servlet7 @@ -205,9 +198,8 @@ %package webapps -License: Apache-2.0 -Group: Productivity/Networking/Web/Servers Summary: The ROOT and examples web applications for Apache Tomcat +Group: Productivity/Networking/Web/Servers Requires: %{name} = %{version}-%{release} Requires(post): jakarta-taglibs-standard >= 1.1 @@ -234,7 +226,7 @@ # so just create a dummy file for later removal touch HACK # the commons-pool test tests the build.xml -for dir in commons-pool-1.5.6-src commons-dbcp-1.4-src; do +for dir in commons-pool-1.5.7-src commons-dbcp-1.4-src; do mkdir -p $dir && touch $dir/build.xml done %if %defined suse_version @@ -246,7 +238,7 @@ jaxrpc-lib.jar=/usr/share/java/geronimo-jaxrpc-1.1-api.jar wsdl4j-lib.jar=/usr/share/java/wsdl4j.jar EOF -%{ant} -v -d -Dbase.path="." \ +%{ant} -Dbase.path="." \ -Dbuild.compiler="modern" \ -Dcommons-collections.jar="$(build-classpath commons-collections)" \ -Dcommons-daemon.jar="$(build-classpath commons-daemon)" \ @@ -258,7 +250,7 @@ -Dtomcat-native.tar.gz="HACK" \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" -%{ant} -v -d dist-prepare dist-source javadoc +%{ant} dist-prepare dist-source javadoc # remove some jars that we'll replace with symlinks later %{__rm} output/build/bin/commons-daemon.jar \ output/build/lib/ecj.jar ++++++ apache-tomcat-7.0.22-src.tar.gz -> apache-tomcat-7.0.26-src.tar.gz ++++++ ++++ 90387 lines of diff (skipped) ++++++ tomcat7-7.0.init ++++++ --- /var/tmp/diff_new_pack.vYQ5Cu/_old 2012-02-25 14:12:23.000000000 +0100 +++ /var/tmp/diff_new_pack.vYQ5Cu/_new 2012-02-25 14:12:23.000000000 +0100 @@ -192,7 +192,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 @@ -230,7 +230,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 @@ -272,7 +272,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="$?" @@ -301,7 +301,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/* -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org