[tomcat6/f15] updated to 6.0.35

[Dave Knox]

commit 6d1c716da9075ace4da12994b955146ef9e6fa09
Author: DKnox <dknox at redhat.com>
Date:   Fri May 11 13:48:19 2012 -0600

    updated to 6.0.35

 .gitignore   |    1 +
 sources      |    2 +-
 tomcat6.spec |   18 +++++-------------
 3 files changed, 7 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5ff9c77..c80a3a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ apache-tomcat-6.0.26-src.tar.gz
 apache-tomcat-6.0.29-src.tar.gz
 apache-tomcat-6.0.30-src.tar.gz
 /apache-tomcat-6.0.32-src.tar.gz
+/apache-tomcat-6.0.35-src.tar.gz
diff --git a/sources b/sources
index c43d29a..597d1bb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-19a1eaa9c9938b520d3c360d8cf4af22  apache-tomcat-6.0.32-src.tar.gz
+4d44a7e7610a83ebe930a781257a8b1d  apache-tomcat-6.0.35-src.tar.gz
diff --git a/tomcat6.spec b/tomcat6.spec
index ed641ce..97951fc 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 32
+%global micro_version 35
 %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:       10%{?dist}
+Release:       1%{?dist}
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 Group:         Networking/Daemons
@@ -72,12 +72,6 @@ Source9:       jsp-api-OSGi-MANIFEST.MF
 Source10:      %{name}-%{major_version}.%{minor_version}-log4j.properties
 Patch0:        %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
 Patch1:        %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
-# Contained in 6.0.32
-#Patch2:        %{name}-%{major_version}.%{minor_version}-rhbz-674601.patch
-Patch3:			%{name}-6.0.32-CVE-2011-2204-rhbz-717016.patch
-Patch4: %{name}-6.0.32-CVE-2011-2526-rhbz-721087.patch
-Patch5: %{name}-6.0.32-CVE-2011-3190-rhbz-738502.patch
-Patch6: %{name}-6.0.32-CVE-2011-1184-rhbz-741407.patch
 
 BuildArch:     noarch
 
@@ -214,11 +208,6 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
 
 %patch0 -p0
 %patch1 -p0
-#%patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
 
 %{__ln_s} $(build-classpath jakarta-taglibs-core) webapps/examples/WEB-INF/lib/jstl.jar
 %{__ln_s} $(build-classpath jakarta-taglibs-standard) webapps/examples/WEB-INF/lib/standard.jar
@@ -588,6 +577,9 @@ fi
 %{appdir}/sample
 
 %changelog
+* Wed May 9 2012 David Knox <dknox at redhat.com> 0:6.0.35-1
+- Updated to tomcat6.0.35
+
 * Mon Oct 24 2011 David Knox <dknox at redhat.com> 0:6.0.32-10
 - Resolves: rhbz 748015 - DocBase does not exist: changed permissions
 - on basedir to 775.