Update to 6.0.30.

Drop jdt-core.pom which is gone upstream now.
This commit is contained in:
Alexander Kurtakov 2011-02-03 09:43:54 +02:00
parent a1884b9437
commit 477b5e91d1
3 changed files with 9 additions and 4 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@ apache-tomcat-6.0.20-src.tar.gz
apache-tomcat-6.0.24-src.tar.gz apache-tomcat-6.0.24-src.tar.gz
apache-tomcat-6.0.26-src.tar.gz apache-tomcat-6.0.26-src.tar.gz
apache-tomcat-6.0.29-src.tar.gz apache-tomcat-6.0.29-src.tar.gz
apache-tomcat-6.0.30-src.tar.gz

View File

@ -1 +1 @@
260de5ae62f415b9c085c5aeed4ef24c apache-tomcat-6.0.29-src.tar.gz 7b811c9092bcb7779bd8df772744ac15 apache-tomcat-6.0.30-src.tar.gz

View File

@ -31,7 +31,7 @@
%global jspspec 2.1 %global jspspec 2.1
%global major_version 6 %global major_version 6
%global minor_version 0 %global minor_version 0
%global micro_version 29 %global micro_version 30
%global packdname apache-tomcat-%{version}-src %global packdname apache-tomcat-%{version}-src
%global servletspec 2.5 %global servletspec 2.5
%global elspec 2.1 %global elspec 2.1
@ -53,7 +53,7 @@
Name: tomcat6 Name: tomcat6
Epoch: 0 Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version} Version: %{major_version}.%{minor_version}.%{micro_version}
Release: 3%{?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: Networking/Daemons Group: Networking/Daemons
@ -376,7 +376,7 @@ done
# we won't install dbcp, juli-adapters and juli-extras pom files # we won't install dbcp, juli-adapters and juli-extras pom files
for pom in annotations-api.pom catalina.pom jasper-el.pom jasper.pom \ for pom in annotations-api.pom catalina.pom jasper-el.pom jasper.pom \
catalina-ha.pom el-api.pom jasper-jdt.pom; do catalina-ha.pom el-api.pom; do
%{__cp} -a $pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-$pom %{__cp} -a $pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-$pom
base=`basename $pom .pom` base=`basename $pom .pom`
%add_to_maven_depmap org.apache.tomcat $base %{version} JPP/%{name} $base %add_to_maven_depmap org.apache.tomcat $base %{version} JPP/%{name} $base
@ -561,6 +561,10 @@ fi
%{appdir}/sample %{appdir}/sample
%changelog %changelog
* Thu Feb 3 2011 Alexander Kurtakov <akurtako@redhat.com> 0:6.0.30-1
- Update to 6.0.30.
- Drop jdt-core.pom which is gone upstream now.
* Wed Feb 2 2011 David Knox <dknox@redhat.com> 0:6.0.29-3 * Wed Feb 2 2011 David Knox <dknox@redhat.com> 0:6.0.29-3
- Resolves rhbz# 674601 - JDK Double.parseDouble DoS - Resolves rhbz# 674601 - JDK Double.parseDouble DoS