rpms/tomcat
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated to 7.0.34

Browse Source 
- ecj >= 4.2.1 now required
- Resolves: rhbz 889395 concat classpath correctly; chdir to $CATALINA_HOME
This commit is contained in:
Ivan Afonichev 2012-12-24 02:24:16 +04:00
parent 50ce272e2f
commit a91e144155
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sources
View File

@ -1 +1 @@
1693d330f195366a6cd852bf3ce3eb95 apache-tomcat-7.0.33-src.tar.gz 49243b6d5c44a8bfa739d6dec53825f7 apache-tomcat-7.0.34-src.tar.gz

11
tomcat-7.0.wrapper
View File

@ -22,11 +22,16 @@ if [ -r "/etc/sysconfig/${NAME}" ]; then
fi fi
set_javacmd set_javacmd
cd ${CATALINA_HOME}
# CLASSPATH munging # CLASSPATH munging
if [ -n "$JSSE_HOME" ]; then if [ ! -z "$CLASSPATH" ] ; then
CLASSPATH="${CLASSPATH}:$(build-classpath jcert jnet jsse 2>/dev/null)" CLASSPATH="$CLASSPATH":
fi fi
CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar"
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" CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar"
CLASSPATH="${CLASSPATH}:$(build-classpath commons-daemon 2>/dev/null)" CLASSPATH="${CLASSPATH}:$(build-classpath commons-daemon 2>/dev/null)"

13
tomcat.spec
View File

@ -31,7 +31,7 @@
%global jspspec 2.2 %global jspspec 2.2
%global major_version 7 %global major_version 7
%global minor_version 0 %global minor_version 0
%global micro_version 33 %global micro_version 34
%global packdname apache-tomcat-%{version}-src %global packdname apache-tomcat-%{version}-src
%global servletspec 3.0 %global servletspec 3.0
%global elspec 2.2 %global elspec 2.2
@ -54,7 +54,7 @@
Name: tomcat Name: tomcat
Epoch: 0 Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version} 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 Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: System Environment/Daemons Group: System Environment/Daemons
@ -90,7 +90,7 @@ BuildArch: noarch
BuildRequires: ant BuildRequires: ant
BuildRequires: ant-nodeps BuildRequires: ant-nodeps
BuildRequires: ecj BuildRequires: ecj >= 4.2.1
BuildRequires: findutils BuildRequires: findutils
BuildRequires: apache-commons-collections BuildRequires: apache-commons-collections
BuildRequires: apache-commons-daemon 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}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release}
Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
Requires: %{name}-el-%{elspec}-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-collections
Requires: apache-commons-dbcp Requires: apache-commons-dbcp
Requires: apache-commons-pool Requires: apache-commons-pool
@ -676,6 +676,11 @@ fi
%attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
%changelog %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 * Fri Dec 7 2012 Ivan Afonichev <ivan.afonichev@gmail.com> 0:7.0.33-2
- Resolves: rhbz 883806 refix logdir ownership - Resolves: rhbz 883806 refix logdir ownership