Hello community,
here is the log from the commit of package tomcat6 for openSUSE:Factory
checked in at Fri Feb 5 14:29:05 CET 2010.
--------
--- tomcat6/tomcat6.changes 2009-09-30 10:06:29.000000000 +0200
+++ /mounts/work_src_done/STABLE/tomcat6/tomcat6.changes 2010-02-03 15:47:08.000000000 +0100
@@ -1,0 +2,27 @@
+Wed Feb 3 12:39:44 UTC 2010 - mvyskocil@suse.cz
+
+- Update to 6.0.24 (bugfix release). This obsoletes patch
+ * tomcat6-bug47316.patch
+- Merged with tomcat6-6.0.18-10.jpp6.src.rpm
+ * return the jpackage.org license header in spec
+ * polish in spec (use more macros)
+ * add logrotate support
+ * add patch to document webapps in %%{_sysconfdir}/%%{name}/tomcat-users.xml
+ * move %%{_bindir}/d%%{name} to %%{_sbindir}/%%{name} and provide symlink to
+ %%{_sbindir}/d%%{name}
+ * add digest and tool-wrapper scripts
+ * explicitly unset CLASSPATH
+ * explicitly set OPT_JAR_LIST to include ant/ant-trax
+ * build and install sample webapp
+ * use copy instead of move to fix short-circuit install build
+ * version jsp and servlet Provides with their spec versions
+ * make initscript LSB-complaint
+ * add el subpackage
+
+-------------------------------------------------------------------
+Tue Jan 5 14:20:08 UTC 2010 - mvyskocil@suse.cz
+
+- fixed bnc#565901 - missing catalina.sh
+ * added catalina.sh (link from dtomcat6) to improve upstream compatibility
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
apache-tomcat-6.0.20-src.tar.bz2
tomcat6-bug47316.patch
New:
----
apache-tomcat-6.0.24-src.tar.bz2
tomcat6-6.0-digest.script
tomcat6-6.0.logrotate
tomcat6-6.0.starter
tomcat6-6.0-tomcat-users-webapp.patch
tomcat6-6.0-tool-wrapper.script
tomcat6-rpmlintrc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libtcnative-1-0.spec ++++++
--- /var/tmp/diff_new_pack.35zUE2/_old 2010-02-05 14:28:03.000000000 +0100
+++ /var/tmp/diff_new_pack.35zUE2/_new 2010-02-05 14:28:03.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libtcnative-1-0 (Version 1.3.3)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 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
@@ -19,7 +19,7 @@
%define section free
%define tomcat_major_version 6
%define tomcat_minor_version 0
-%define tomcat_macro_version 20
+%define tomcat_macro_version 24
%define tomcat_version %{tomcat_major_version}.%{tomcat_minor_version}.%{tomcat_macro_version}
%define packdname apache-tomcat-%{tomcat_version}-src
%define libname libtcnative-1
@@ -29,7 +29,7 @@
Name: libtcnative-1-0
Version: %{major}.%{minor}.%{micro}
-Release: 2
+Release: 3
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.35zUE2/_old 2010-02-05 14:28:03.000000000 +0100
+++ /var/tmp/diff_new_pack.35zUE2/_new 2010-02-05 14:28:03.000000000 +0100
@@ -1,7 +1,9 @@
#
-# spec file for package tomcat6 (Version 6.0.20)
+# spec file for package tomcat6 (Version 6.0.24)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2000-2009, JPackage Project
+# All rights reserved.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,9 +22,10 @@
%define jspspec 2.1
%define major_version 6
%define minor_version 0
-%define macro_version 20
+%define micro_version 24
%define packdname apache-tomcat-%{version}-src
%define servletspec 2.5
+%define elspec 1.0
%define tcuid 91
# FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/
%define appdir /srv/%{name}/webapps
@@ -31,12 +34,14 @@
%define homedir %{_datadir}/%{name}
%define libdir %{_javadir}/%{name}
%define logdir %{_localstatedir}/log/%{name}
-%define tempdir %{_localstatedir}/cache/%{name}/temp
-%define workdir %{_localstatedir}/cache/%{name}
+%define cachedir %{_localstatedir}/cache/%{name}
+%define tempdir %{cachedir}/temp
+%define workdir %{cachedir}/work
+%define _initrddir %{_sysconfdir}/init.d
Name: tomcat6
-Version: %{major_version}.%{minor_version}.%{macro_version}
-Release: 2
+Version: %{major_version}.%{minor_version}.%{micro_version}
+Release: 1
Summary: Apache Servlet/JSP Engine, RI for Servlet 2.5/JSP 2.1 API
Group: Productivity/Networking/Web/Servers
License: Apache Software License ..
@@ -47,9 +52,15 @@
# sysconfig removal - bnc#471639
#Source3: %{name}-%{major_version}.%{minor_version}.sysconfig
Source4: %{name}-%{major_version}.%{minor_version}.wrapper
+Source5: %{name}-%{major_version}.%{minor_version}.logrotate
+Source6: %{name}-%{major_version}.%{minor_version}-digest.script
+Source7: %{name}-%{major_version}.%{minor_version}-tool-wrapper.script
+Source8: %{name}-%{major_version}.%{minor_version}.starter
+Source1000: tomcat6-rpmlintrc
+#PATCH-FIX-UPSTREAM: from jpackage.org package
Patch0: %{name}-%{major_version}.%{minor_version}.bootstrap-MANIFEST.MF.patch
-#PATCH-FIX-UPSTREAM: bao#47316, bnc#542634
-Patch1: tomcat6-bug47316.patch
+#PATCH-FIX-UPSTREAM: from jpackage.org package
+Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
BuildRequires: ant
@@ -58,7 +69,7 @@
BuildRequires: findutils
BuildRequires: jakarta-commons-collections
BuildRequires: jakarta-commons-daemon
-BuildRequires: java-devel >= 1.5.0
+BuildRequires: java-devel >= 1.6.0
BuildRequires: jpackage-utils >= 1.7.0
BuildRequires: junit
BuildRequires: sed
@@ -97,7 +108,7 @@
Requires: %{name} = %{version}-%{release}
%description admin-webapps
-The host-manager and manager web applications for Apache Tomcat
+The host-manager and manager web applications for Apache Tomcat.
@@ -108,8 +119,20 @@
Requires: %{name} = %{version}-%{release}
%description docs-webapp
-The docs web application for Apache Tomcat
+The docs web application for Apache Tomcat.
+%package el-1_0-api
+License: Apache Software License ..
+Summary: Expression Language v1.0 API
+Group: Development/Libraries/Java
+Provides: %{name}-el-%{elspec}-api = %{version}-%{release}
+Provides: el_1_0_api = %{version}-%{release}
+Provides: el_api = 1.0
+Requires(preun):%{_sbindir}/update-alternatives
+Requires(post): %{_sbindir}/update-alternatives
+
+%description el-1_0-api
+Expression Language 1.0.
%package javadoc
@@ -118,7 +141,7 @@
Summary: Javadoc generated documentation for Apache Tomcat
%description javadoc
-Javadoc generated documentation for Apache Tomcat
+Javadoc generated documentation for Apache Tomcat.
@@ -126,6 +149,8 @@
License: Apache Software License ..
Group: Productivity/Networking/Web/Servers
Summary: Apache Tomcat JSP API implementation classes
+Provides: jsp = %{jspspec}
+Provides: jsp21
Provides: %{name}-jsp-2.1-api
Requires: %{name}-servlet-2_5-api = %{version}-%{release}
Requires(post): %{_sbindir}/update-alternatives
@@ -142,11 +167,12 @@
Summary: Libraries needed to run the Tomcat Web container
Requires: %{name}-jsp-2_1-api = %{version}-%{release}
Requires: %{name}-servlet-2_5-api = %{version}-%{release}
+Requires: %{name}-el-%{elspec}-api = %{version}-%{release}
Requires(post): ecj >= 3.2.2
Requires(post): jakarta-commons-collections-tomcat5
Requires(post): jakarta-commons-dbcp-tomcat5
Requires(post): jakarta-commons-pool-tomcat5
-Requires(preun): %{__rm}
+Requires(preun):%{__rm}
%description lib
Libraries needed to run the Tomcat Web container
@@ -158,6 +184,9 @@
Group: Productivity/Networking/Web/Servers
Summary: Apache Tomcat Servlet API implementation classes
Provides: %{name}-servlet-2.5-api
+Provides: servlet = %{servletspec}
+Provides: servlet6
+Provides: servlet25
Requires(post): %{_sbindir}/update-alternatives
Requires(postun): %{_sbindir}/update-alternatives
@@ -179,13 +208,17 @@
%prep
-%{__rm} -rf ${RPM_BUILD_DIR}/%{name}-%{version}
%setup -q -c -T -a 0
+# remove pre-built binaries and windows files
+find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \
+ -name "*.jar" -o -name "*.war" -o -name "*.zip" \) | xargs -t %{__rm}
%patch0 -p1
-%patch1 -b .bug47316
+%patch1 -p0
%build
-pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}
+export CLASSPATH=
+export OPT_JAR_LIST="ant/ant-trax"
+pushd %{packdname}
# remove pre-built binaries and windows files
find . \( -name "*.bat" -o -name "*.class" -o -name "*.gz" -o \
-name "*.jar" -o -name "*.zip" \) | xargs -t %{__rm} -f
@@ -198,7 +231,7 @@
export ANT_OPTS=-Xmx500M
%endif
# who needs a build.properties file anyway
- ant -Dbase.path="${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}" \
+ %{ant} -Dbase.path="." \
-Dbuild.compiler="modern" \
-Dcommons-collections.jar="$(build-classpath commons-collections)" \
-Dcommons-daemon.jar="$(build-classpath commons-daemon)" \
@@ -208,12 +241,11 @@
-Dtomcat-dbcp.jar="HACK" \
-Dtomcat-native.tar.gz="HACK" \
-Dversion="%{version}" \
- -Dversion.build="%{macro_version}" \
- -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5
+ -Dversion.build="%{micro_version}"
# javadoc generation
- ant -f dist.xml dist-prepare
- ant -f dist.xml dist-source
- ant -f dist.xml dist-javadoc
+ %{ant} -f dist.xml dist-prepare
+ %{ant} -f dist.xml dist-source
+ %{ant} -f dist.xml dist-javadoc
# remove some jars that we'll replace with symlinks later
%{__rm} output/build/bin/commons-daemon.jar \
output/build/lib/ecj.jar
@@ -222,34 +254,44 @@
output/build/bin/tomcat-native.tar.gz \
output/build/lib/HACK
popd
+pushd %{packdname}/output/dist/src/webapps/docs/appdev/sample/src
+%{__mkdir_p} ../web/WEB-INF/classes
+%{javac} -cp ../../../../../../../../output/build/lib/servlet-api.jar -d ../web/WEB-INF/classes mypackage/Hello.java
+pushd ../web
+%{jar} cf ../../../../../../../../output/build/webapps/docs/appdev/sample/sample.war *
+popd
+popd
%install
# build initial path structure
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_bindir}
+%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sbindir}
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}
+%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_initrddir}
+%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}
-%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/init.d
%if ! %defined suse_version
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
%endif
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{appdir}
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{bindir}
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{confdir}
+%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{confdir}/Catalina/localhost
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{libdir}
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{logdir}
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{homedir}
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{tempdir}
-%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{workdir}
+%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{cachedir}
# move things into place
-pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/output/build
- %{__mv} bin/*.{jar,xml} ${RPM_BUILD_ROOT}%{bindir}
- %{__mv} conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{confdir}
- %{__mv} lib/*.jar ${RPM_BUILD_ROOT}%{libdir}
- %{__mv} webapps/* ${RPM_BUILD_ROOT}%{appdir}
+pushd %{packdname}/output/build
+ %{__cp} -a bin/*.{jar,xml} ${RPM_BUILD_ROOT}%{bindir}
+ %{__cp} -a conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{confdir}
+ %{__cp} -a lib/*.jar ${RPM_BUILD_ROOT}%{libdir}
+ %{__cp} -a webapps/* ${RPM_BUILD_ROOT}%{appdir}
popd
# javadoc
-pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/output/dist/webapps
- %{__mv} docs/api/* ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}
+pushd %{packdname}/output/dist/webapps
+ %{__cp} -a docs/api/* ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}
popd
%{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
-e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" %{SOURCE1} \
@@ -264,18 +306,34 @@
> ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}
%endif
%{__install} -m 0644 %{SOURCE2} \
- ${RPM_BUILD_ROOT}%{_sysconfdir}/init.d/%{name}
+ ${RPM_BUILD_ROOT}%{_initrddir}/%{name}
%{__install} -m 0644 %{SOURCE4} \
- ${RPM_BUILD_ROOT}%{_bindir}/d%{name}
-# create jsp and servlet API symlinks
+ ${RPM_BUILD_ROOT}%{_sbindir}/d%{name}
+#%{__ln_s} %{name} ${RPM_BUILD_ROOT}%{_sbindir}/d%{name}
+%{__install} -m 0644 %{SOURCE8} \
+ ${RPM_BUILD_ROOT}%{_sbindir}/%{name}
+%{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE5} \
+ > ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}
+%{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
+ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
+ -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE6} \
+ > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-digest
+%{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
+ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
+ -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE7} \
+ > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-tool-wrapper
pushd ${RPM_BUILD_ROOT}%{_javadir}
+ # create jsp and servlet and el API symlinks
%{__mv} %{name}/jsp-api.jar %{name}-jsp-%{jspspec}-api-%{version}.jar
- %{__mv} %{name}/servlet-api.jar \
- %{name}-servlet-%{servletspec}-api-%{version}.jar
- %{__ln_s} %{name}-jsp-%{jspspec}-api-%{version}.jar \
- %{name}-jsp-%{jspspec}-api.jar
- %{__ln_s} %{name}-servlet-%{servletspec}-api-%{version}.jar \
- %{name}-servlet-%{servletspec}-api.jar
+ %{__mv} %{name}/servlet-api.jar %{name}-servlet-%{servletspec}-api-%{version}.jar
+ %{__mv} %{name}/el-api.jar %{name}-el-%{elspec}-api-%{version}.jar
+ /bin/touch el_1_0_api.jar
+ /bin/touch el_api.jar
+ /bin/touch jsp.jar
+ /bin/touch servlet.jar
+ %{__ln_s} %{name}-jsp-%{jspspec}-api-%{version}.jar %{name}-jsp-%{jspspec}-api.jar
+ %{__ln_s} %{name}-servlet-%{servletspec}-api-%{version}.jar %{name}-servlet-%{servletspec}-api.jar
+ %{__ln_s} %{name}-el-%{elspec}-api-%{version}.jar %{name}-el-%{elspec}-api.jar
popd
pushd ${RPM_BUILD_ROOT}%{libdir}
# fix up jars to include version number
@@ -284,9 +342,10 @@
%{__mv} ${j}.jar ${j}-%{version}.jar
%{__ln_s} ${j}-%{version}.jar ${j}.jar
done
- # symlink JSP and servlet API jars
+ # symlink JSP and servlet and el API jars
%{__ln_s} ../%{name}-jsp-%{jspspec}-api-%{version}.jar .
%{__ln_s} ../%{name}-servlet-%{servletspec}-api-%{version}.jar .
+ %{__ln_s} ../%{name}-el-%{elspec}-api-%{version}.jar .
popd
pushd ${RPM_BUILD_ROOT}%{bindir}
# fix up jars to include version number
@@ -303,18 +362,27 @@
%{__ln_s} %{libdir} lib
%{__ln_s} %{logdir} logs
%{__ln_s} %{tempdir} temp
- %{__ln_s} %{workdir} work
+ %{__ln_s} %{cachedir} work
popd
+# install sample webapp
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{appdir}/sample
+pushd ${RPM_BUILD_ROOT}%{appdir}/sample
+%{jar} xf ${RPM_BUILD_ROOT}%{appdir}/docs/appdev/sample/sample.war
+popd
+%{__rm} ${RPM_BUILD_ROOT}%{appdir}/docs/appdev/sample/sample.war
+%{_bindir}/build-jar-repository -p ${RPM_BUILD_ROOT}%{libdir} commons-collections-tomcat5 \
+ commons-dbcp-tomcat5 commons-pool-tomcat5 ecj
+%if %defined suse_version
# bnc#424675
-install -d -m 0755 ${RPM_BUILD_ROOT}%{workdir}/Catalina
-%{__ln_s} %{workdir}/Catalina ${RPM_BUILD_ROOT}/%{confdir}/Catalina
+install -d -m 0755 ${RPM_BUILD_ROOT}%{cachedir}/Catalina
+%{__ln_s} %{cachedir}/Catalina ${RPM_BUILD_ROOT}/%{confdir}/Catalina
# bnc#418664
install -d -m 0755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/ant.d/
echo "tomcat6/catalina-ant" > ${RPM_BUILD_ROOT}/%{_sysconfdir}/ant.d/catalina-ant
-%if %defined suse_version
%fdupes $RPM_BUILD_ROOT /srv/%{name}
install -d -m 755 $RPM_BUILD_ROOT/%{_sbindir}
-ln -sf %{_sysconfdir}/init.d/%{name} $RPM_BUILD_ROOT/%{_sbindir}/rc%{name}
+ln -sf %{_initrddir}/%{name} $RPM_BUILD_ROOT/%{_sbindir}/rc%{name}
+ln -sf %{_sbindir}/d%{name} %{buildroot}/%{_bindir}/catalina.sh
%endif
%clean
@@ -361,6 +429,16 @@
/sbin/chkconfig --add %{name}
%endif
+%post el-1_0-api
+%{_sbindir}/update-alternatives --install %{_javadir}/el_api.jar el_api %{_javadir}/%{name}-el-%{elspec}-api.jar 10000
+%{_sbindir}/update-alternatives --install %{_javadir}/el_1_0_api.jar el_1_0_api %{_javadir}/%{name}-el-%{elspec}-api.jar 10000
+
+%preun el-1_0-api
+if [ "$1" = "0" ]; then
+ %{_sbindir}/update-alternatives --remove el_api %{_javadir}/%{name}-el-%{elspec}-api.jar
+ %{_sbindir}/update-alternatives --remove el_1_0_api %{_javadir}/%{name}-el-%{elspec}-api.jar
+fi
+
%post jsp-2_1-api
%{_sbindir}/update-alternatives --install %{_javadir}/jsp.jar jsp \
%{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20100
@@ -381,18 +459,18 @@
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20500
%post webapps
-build-jar-repository %{appdir}/examples/WEB-INF/lib \
+%{_bindir}/build-jar-repository -p %{appdir}/examples/WEB-INF/lib \
taglibs-core.jar taglibs-standard.jar 2>&1
%preun
-# clean tempdir and workdir on removal or upgrade
-## % {__rm} -fr %{workdir}/* # %{tempdir}/*
+# clean tempdir and cachedir on removal or upgrade
+## % {__rm} -rf %{workdir}/* %{tempdir}/*
%if %defined suse_version
%stop_on_removal %{name}
%else
if [ "$1" = "0" ]; then
- [ -f /var/lock/subsys/%{name} ] && %{_sysconfdir}/init.d/%{name} stop
- [ -f %{_sysconfdir}/init.d/%{name} ] && /sbin/chkconfig --del %{name}
+ %{_initrddir}/%{name} stop >/dev/null 2>&1
+ /sbin/chkconfig --del %{name}
fi
%endif
@@ -426,29 +504,42 @@
%files
%defattr(0644,root,root,0755)
%doc %{packdname}/{LICENSE,NOTICE,RELEASE*}
-%attr(755,root,root) %{_bindir}/d%{name}
-%attr(0770,root,tomcat) %dir %{_localstatedir}/log/%{name}
-%attr(755,root,root) %{_sysconfdir}/init.d/%{name}
+%attr(0755,root,root) %{_bindir}/%{name}-digest
+%attr(0755,root,root) %{_bindir}/%{name}-tool-wrapper
+%attr(0755,root,root) %{_sbindir}/d%{name}
+%attr(0755,root,root) %{_sbindir}/%{name}
+%attr(0775,root,tomcat) %dir %{logdir}
+%attr(0755,root,root) %{_initrddir}/%{name}
+%if %{defined suse_version}
+#bnc#565901
+%attr(0755,root,root) %{_bindir}/catalina.sh
+%endif
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%if ! %defined suse_version
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%endif
%attr(0775,root,tomcat) %dir %{appdir}
%dir %{confdir}
+%dir %{confdir}/Catalina
+#%attr(0775,root,tomcat) %dir %{confdir}/Catalina/localhost
%config(noreplace) %{confdir}/%{name}.conf
%config(noreplace) %{confdir}/*.policy
%config(noreplace) %{confdir}/*.properties
%config(noreplace) %{confdir}/context.xml
%config(noreplace) %{confdir}/server.xml
-%attr(660,root,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml
+%attr(0660,root,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml
%config(noreplace) %{confdir}/web.xml
+%attr(0775,root,tomcat) %dir %{cachedir}
%attr(0775,root,tomcat) %dir %{tempdir}
-%attr(0775,root,tomcat) %dir %{workdir}
+%attr(0775,root,tomcat) %dir %{cachedir}
%{homedir}
+%if %{defined suse_version}
%dir /srv/%{name}
%{_sbindir}/rc%{name}
#bnc#424675
-%attr(0775,root,tomcat) %dir %{workdir}/Catalina
+%attr(0775,root,tomcat) %dir %{cachedir}/Catalina
%{confdir}/Catalina
+%endif
%files admin-webapps
%defattr(0644,root,root,0755)
@@ -459,13 +550,22 @@
%defattr(0644,root,root,0755)
%{appdir}/docs
+%files el-1_0-api
+%defattr(0644,root,root,0755)
+%{_javadir}/%{name}-el-%{elspec}-api-%{version}.jar
+%{_javadir}/%{name}-el-%{elspec}-api.jar
+%ghost %{_javadir}/el_1_0_api.jar
+%ghost %{_javadir}/el_api.jar
+
%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}
%files jsp-2_1-api
%defattr(0644,root,root,0755)
-%{_javadir}/%{name}-jsp*.jar
+%{_javadir}/%{name}-jsp-%{jspspec}-api-%{version}.jar
+%{_javadir}/%{name}-jsp-%{jspspec}-api.jar
+%ghost %{_javadir}/jsp.jar
%files lib
%defattr(0644,root,root,0755)
@@ -475,12 +575,15 @@
%files servlet-2_5-api
%defattr(0644,root,root,0755)
-%{_javadir}/%{name}-servlet*.jar
+%{_javadir}/%{name}-servlet-%{servletspec}-api-%{version}.jar
+%{_javadir}/%{name}-servlet-%{servletspec}-api.jar
+%ghost %{_javadir}/servlet.jar
%files webapps
%defattr(0644,root,root,0755)
#bnc#520532
%config(noreplace) %{appdir}/ROOT
%{appdir}/examples
+%{appdir}/sample
%changelog
++++++ apache-tomcat-6.0.20-src.tar.bz2 -> apache-tomcat-6.0.24-src.tar.bz2 ++++++
++++ 45733 lines of diff (skipped)
++++++ tomcat6-6.0.bootstrap-MANIFEST.MF.patch ++++++
--- /var/tmp/diff_new_pack.35zUE2/_old 2010-02-05 14:28:05.000000000 +0100
+++ /var/tmp/diff_new_pack.35zUE2/_new 2010-02-05 14:28:05.000000000 +0100
@@ -1,10 +1,12 @@
-Index: tomcat6-6.0.20/apache-tomcat-6.0.20-src/res/bootstrap.jar.manifest
+Index: tomcat6-6.0.24/apache-tomcat-6.0.24-src/res/META-INF/bootstrap.jar.manifest
===================================================================
---- tomcat6-6.0.20.orig/apache-tomcat-6.0.20-src/res/bootstrap.jar.manifest 2009-05-14 01:15:30.000000000 +0200
-+++ tomcat6-6.0.20/apache-tomcat-6.0.20-src/res/bootstrap.jar.manifest 2009-06-03 10:37:07.529671107 +0200
+--- tomcat6-6.0.24.orig/apache-tomcat-6.0.24-src/res/META-INF/bootstrap.jar.manifest 2010-01-19 14:43:41.000000000 +0100
++++ tomcat6-6.0.24/apache-tomcat-6.0.24-src/res/META-INF/bootstrap.jar.manifest 2010-02-02 15:24:19.683835389 +0100
@@ -1,5 +1,4 @@
Manifest-Version: 1.0
Main-Class: org.apache.catalina.startup.Bootstrap
--Class-Path: commons-daemon.jar tomcat-juli.jar tomcat-coyote.jar
+-Class-Path: commons-daemon.jar tomcat-juli.jar
Specification-Title: Catalina
- Specification-Version: 6.0
+-Specification-Version: 6.0
+\ No newline at end of file
++Specification-Version: 6.0
++++++ tomcat6-6.0-digest.script ++++++
#!/bin/sh
#
# tomcat6-digest script
# JPackage Project http://www.jpackage.org/
# Source functions library
if [ -f /usr/share/java-utils/java-functions ] ; then
. /usr/share/java-utils/java-functions
else
echo "Can't find functions library, aborting"
exit 1
fi
# Get the tomcat config (use this for environment specific settings)
if [ -z "${TOMCAT_CFG}" ]; then
TOMCAT_CFG="/etc/tomcat6/tomcat6.conf"
fi
if [ -r "$TOMCAT_CFG" ]; then
. $TOMCAT_CFG
fi
set_javacmd
# CLASSPATH munging
if [ -n "$JSSE_HOME" ]; then
CLASSPATH="${CLASSPATH}:$(build-classpath jcert jnet jsse 2>/dev/null)"
fi
CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar"
CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar"
export CLASSPATH
# Configuration
MAIN_CLASS="org.apache.catalina.startup.Tool"
BASE_FLAGS="-Dcatalina.home=\"$CATALINA_HOME\""
BASE_OPTIONS=""
BASE_JARS="commons-daemon tomcat6/catalina servlet"
# Set parameters
set_classpath $BASE_JARS
set_flags $BASE_FLAGS
set_options $BASE_OPTIONS
# Let's start
run -server org.apache.catalina.realm.RealmBase "$@"
++++++ tomcat6-6.0.init ++++++
--- /var/tmp/diff_new_pack.35zUE2/_old 2010-02-05 14:28:05.000000000 +0100
+++ /var/tmp/diff_new_pack.35zUE2/_new 2010-02-05 14:28:05.000000000 +0100
@@ -15,7 +15,7 @@
# System startup script for the Tomcat servlet container
#
### BEGIN INIT INFO
-# Provides: tomcat
+# Provides: tomcat6
# Required-Start: $network $syslog $remote_fs
# Should-Start: $named $syslog $time
# Required-Stop: $network $syslog
@@ -29,6 +29,14 @@
# set a minimalist PATH
PATH="/bin:/sbin"
+# Source LSB function library.
+if [ -r /lib/lsb/init-functions ]; then
+ . /lib/lsb/init-functions
+else
+ exit 1
+fi
+DISTRIB_ID=`lsb_release -i -s 2>/dev/null`
+
NAME="$(basename $0)"
unset ISBOOT
if [ "${NAME:0:1}" = "S" -o "${NAME:0:1}" = "K" ]; then
@@ -65,16 +73,18 @@
CONNECTOR_PORT="${CONNECTOR_PORT:-8080}"
# Path to the tomcat launch script
-TOMCAT_SCRIPT="/usr/bin/dtomcat6"
+TOMCAT_SCRIPT="/usr/sbin/dtomcat6"
# Tomcat program name
-TOMCAT_PROG="$NAME"
+TOMCAT_PROG="${NAME}"
# Define the tomcat username
TOMCAT_USER="${TOMCAT_USER:-tomcat}"
# Define the tomcat log file
-TOMCAT_LOG="${TOMCAT_LOG:-/var/log/tomcat6/catalina.out}"
+TOMCAT_LOG="${TOMCAT_LOG:-/var/log/${NAME}/catalina.out}"
+# Define the tomcat pid file
+export CATALINA_PID="/var/run/${NAME}.pid"
RETVAL="0"
@@ -183,7 +193,7 @@
# /etc/sysconfig/${NAME}
# )"
# fi
- TOMCAT_SCRIPT="$options $TOMCAT_SCRIPT"
+ TOMCAT_SCRIPT="$options ${TOMCAT_SCRIPT}"
}
# See how we were called.
@@ -217,11 +227,12 @@
-e "s/8009/${randomPort2}/g" -e "s/8443/${randomPort3}/g" \
${CATALINA_HOME}/conf/server.xml
fi
+ parseOptions
if [ "$SECURITY_MANAGER" = "true" ]; then
- $SU - $TOMCAT_USER -c "$TOMCAT_SCRIPT start-security" \
+ $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start-security" \
>> $TOMCAT_LOG 2>&1
else
- $SU - $TOMCAT_USER -c "$TOMCAT_SCRIPT start" >> $TOMCAT_LOG 2>&1
+ $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start" >> $TOMCAT_LOG 2>&1
fi
RETVAL="$?"
if [ "$RETVAL" -eq 0 ]; then
@@ -269,7 +280,8 @@
function stop() {
echo -n "Shutting down Tomcat ($CATALINA_BASE)"
if [ -f "/var/lock/subsys/${NAME}" ]; then
- $SU - $TOMCAT_USER -c "$TOMCAT_SCRIPT stop" >> $TOMCAT_LOG 2>&1
+ parseOptions
+ $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} stop" >> $TOMCAT_LOG 2>&1
RETVAL="$?"
if [ "$RETVAL" -eq "0" ]; then
count="0"
@@ -278,14 +290,14 @@
until [ "$(ps --pid $kpid | grep -c $kpid)" -eq "0" ] || \
[ "$count" -gt "$SHUTDOWN_WAIT" ]; do
if [ "$SHUTDOWN_VERBOSE" = "true" ]; then
- echo -n -e "\nwaiting for processes $kpid to exit"
+ echo "waiting for processes $kpid to exit"
fi
sleep 1
let count="${count}+1"
done
if [ "$count" -gt "$SHUTDOWN_WAIT" ]; then
if [ "$SHUTDOWN_VERBOSE" = "true" ]; then
- echo -n -e "\nkilling processes which didn't stop"
+ echo "killing processes which didn't stop after $SHUTDOWN_WAIT seconds"
echo -n -e "after "
echo -n "$SHUTDOWN_WAIT seconds"
fi
@@ -319,11 +331,9 @@
# See how we were called.
case "$1" in
start)
- parseOptions
start
;;
stop)
- parseOptions
stop
;;
try-restart)
@@ -336,7 +346,6 @@
rc_status
;;
restart)
- parseOptions
stop
sleep 2
start
++++++ tomcat6-6.0.logrotate ++++++
@@@TCLOG@@@/catalina.out {
copytruncate
weekly
rotate 52
compress
missingok
create 0644 tomcat tomcat
}
++++++ tomcat6-6.0.starter ++++++
#!/bin/sh
#
# Wrapper script for Tomcat 6.0, to be sure it will allways
# be run with correct user profile (tomcat by default)
#
# derived from stuff in tomcat5.init
#
# Gomez Henri