diff options
| author | Ivan Afonichev <ivan.afonichev@gmail.com> | 2012-12-24 02:24:16 +0400 |
|---|---|---|
| committer | Ivan Afonichev <ivan.afonichev@gmail.com> | 2012-12-24 02:24:16 +0400 |
| commit | a91e144155e4101b1b8247c285a6bf3a6207f448 (patch) | |
| tree | cf522bdac0ab3ae26b4af98b94d55d1ec1d1fbbb | |
| parent | 50ce272e2f98db91778ce012e1539dc47f623cbe (diff) | |
| download | tomcat-a91e144155e4101b1b8247c285a6bf3a6207f448.tar.gz tomcat-a91e144155e4101b1b8247c285a6bf3a6207f448.tar.xz tomcat-a91e144155e4101b1b8247c285a6bf3a6207f448.zip | |
Updated to 7.0.34
- ecj >= 4.2.1 now required
- Resolves: rhbz 889395 concat classpath correctly; chdir to $CATALINA_HOME
| -rw-r--r-- | sources | 2 | ||||
| -rw-r--r-- | tomcat-7.0.wrapper | 9 | ||||
| -rw-r--r-- | tomcat.spec | 13 |
3 files changed, 17 insertions, 7 deletions
@@ -1 +1 @@ -1693d330f195366a6cd852bf3ce3eb95 apache-tomcat-7.0.33-src.tar.gz +49243b6d5c44a8bfa739d6dec53825f7 apache-tomcat-7.0.34-src.tar.gz diff --git a/tomcat-7.0.wrapper b/tomcat-7.0.wrapper index 820c622..8d35a2f 100644 --- a/tomcat-7.0.wrapper +++ b/tomcat-7.0.wrapper @@ -22,11 +22,16 @@ if [ -r "/etc/sysconfig/${NAME}" ]; then fi set_javacmd +cd ${CATALINA_HOME} # CLASSPATH munging +if [ ! -z "$CLASSPATH" ] ; then + CLASSPATH="$CLASSPATH": +fi + if [ -n "$JSSE_HOME" ]; then - CLASSPATH="${CLASSPATH}:$(build-classpath jcert jnet jsse 2>/dev/null)" + CLASSPATH="${CLASSPATH}$(build-classpath jcert jnet jsse 2>/dev/null):" fi -CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar" +CLASSPATH="${CLASSPATH}${CATALINA_HOME}/bin/bootstrap.jar" CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar" CLASSPATH="${CLASSPATH}:$(build-classpath commons-daemon 2>/dev/null)" diff --git a/tomcat.spec b/tomcat.spec index 2a83226..cf096de 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 33 +%global micro_version 34 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -54,7 +54,7 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -90,7 +90,7 @@ BuildArch: noarch BuildRequires: ant BuildRequires: ant-nodeps -BuildRequires: ecj +BuildRequires: ecj >= 4.2.1 BuildRequires: findutils BuildRequires: apache-commons-collections BuildRequires: apache-commons-daemon @@ -193,7 +193,7 @@ Summary: Libraries needed to run the Tomcat Web container Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} -Requires: ecj +Requires: ecj >= 4.2.1 Requires: apache-commons-collections Requires: apache-commons-dbcp Requires: apache-commons-pool @@ -676,6 +676,11 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Mon Dec 24 2012 Ivan Afonichev <ivan.afonichev@gmail.com> 0:7.0.34-1 +- Updated to 7.0.34 +- ecj >= 4.2.1 now required +- Resolves: rhbz 889395 concat classpath correctly; chdir to $CATALINA_HOME + * Fri Dec 7 2012 Ivan Afonichev <ivan.afonichev@gmail.com> 0:7.0.33-2 - Resolves: rhbz 883806 refix logdir ownership |