[java-sig-commits] [tomcat: 48/66] Update to 6.0.30.

[Ivan Afonichev]

commit 477b5e91d18ad52eb845b5c3426e1e8faaec8b3e
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Thu Feb 3 09:43:54 2011 +0200

    Update to 6.0.30.
    
    Drop jdt-core.pom which is gone upstream now.

 .gitignore   |    1 +
 sources      |    2 +-
 tomcat6.spec |   10 +++++++---
 3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6590968..aeb3228 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ apache-tomcat-6.0.20-src.tar.gz
 apache-tomcat-6.0.24-src.tar.gz
 apache-tomcat-6.0.26-src.tar.gz
 apache-tomcat-6.0.29-src.tar.gz
+apache-tomcat-6.0.30-src.tar.gz
diff --git a/sources b/sources
index 8f99d1e..3290f93 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-260de5ae62f415b9c085c5aeed4ef24c  apache-tomcat-6.0.29-src.tar.gz
+7b811c9092bcb7779bd8df772744ac15  apache-tomcat-6.0.30-src.tar.gz
diff --git a/tomcat6.spec b/tomcat6.spec
index 1e2c8a6..74d7245 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -31,7 +31,7 @@
 %global jspspec 2.1
 %global major_version 6
 %global minor_version 0
-%global micro_version 29
+%global micro_version 30
 %global packdname apache-tomcat-%{version}-src
 %global servletspec 2.5
 %global elspec 2.1
@@ -53,7 +53,7 @@
 Name:          tomcat6
 Epoch:         0
 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
 
 Group:         Networking/Daemons
@@ -376,7 +376,7 @@ done
 
 # 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 \
-           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
     base=`basename $pom .pom`
     %add_to_maven_depmap org.apache.tomcat $base %{version} JPP/%{name} $base
@@ -561,6 +561,10 @@ fi
 %{appdir}/sample
 
 %changelog
+* Thu Feb 3 2011 Alexander Kurtakov <akurtako at 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 at redhat.com> 0:6.0.29-3
 - Resolves rhbz# 674601 - JDK Double.parseDouble DoS