commit tomcat6 for openSUSE:Factory
Hello community, here is the log from the commit of package tomcat6 for openSUSE:Factory checked in at Tue Jan 25 10:29:37 CET 2011. -------- --- tomcat6/tomcat6.changes 2010-11-25 11:57:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/tomcat6/tomcat6.changes 2010-12-09 11:52:24.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Dec 9 10:50:46 UTC 2010 - mvyskocil@suse.cz + +- fix bnc#655440#c14 - clean workdir of tomcat's webapps to be sure + our fixed jsps will be redeployed on each update + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libtcnative-1-0.spec ++++++ --- /var/tmp/diff_new_pack.t89uHb/_old 2011-01-25 10:28:32.000000000 +0100 +++ /var/tmp/diff_new_pack.t89uHb/_new 2011-01-25 10:28:32.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libtcnative-1-0 (Version 1.3.3) +# spec file for package libtcnative-1-0 # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -29,7 +29,7 @@ Name: libtcnative-1-0 Version: %{major}.%{minor}.%{micro} -Release: 9 +Release: 10 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.t89uHb/_old 2011-01-25 10:28:32.000000000 +0100 +++ /var/tmp/diff_new_pack.t89uHb/_new 2011-01-25 10:28:32.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package tomcat6 (Version 6.0.29) +# spec file for package tomcat6 # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2000-2009, JPackage Project # All rights reserved. # @@ -41,7 +41,7 @@ Name: tomcat6 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 3 +Release: 4 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.5/JSP 2.1 API Group: Productivity/Networking/Web/Servers License: Apache Software License .. @@ -93,6 +93,8 @@ Requires: %{name}-lib = %{version}-%{release} Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig +Requires(post): findutils +Requires(post): coreutils %description Tomcat is the servlet container that is used in the official Reference @@ -430,6 +432,11 @@ echo "Merged settings from '%{_sysconfdir}/sysconfig/%{name}' to '%{confdir}/%{name}.conf'" mv %{_sysconfdir}/sysconfig/%{name} %{_sysconfdir}/%{name}/%{name}.sysconfig.save fi + +# clean workdir of tomcat6's webapps - bnc#655440#c14 +(cd %{workdir}/Catalina/localhost &> /dev/null && \ +find _ docs examples host-manager manager -type f -and \( -name '*.java' -or -name '*.class' \) -delete) || : + %else # install but don't activate /sbin/chkconfig --add %{name} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de