[tomcat6/f16] Updated to 6.0.35

[Dave Knox]

commit 8dc50800a645e0e0509510fe1d35d95a0d7b62cd
Author: DKnox <dknox at redhat.com>
Date:   Tue May 8 12:15:37 2012 -0600

    Updated to 6.0.35

 .gitignore   |    1 +
 sources      |    3 +--
 tomcat6.spec |   25 ++++++++++++++-----------
 3 files changed, 16 insertions(+), 13 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 f1dcb10..597d1bb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-7b811c9092bcb7779bd8df772744ac15  apache-tomcat-6.0.30-src.tar.gz
-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 81742fc..9dee60a 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:       19%{?dist}
+Release:       1%{?dist}
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 Group:         Networking/Daemons
@@ -77,10 +77,10 @@ Patch0:        %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.p
 Patch1:        %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
 # In 6.0.32 source
 #Patch2:        %{name}-%{major_version}.%{minor_version}-rhbz-674601.patch
-Patch3:        %{name}-6.0.32-CVE-2011-2204-rhbz-717016.patch
-Patch4: 			tomcat6-6.0.32-CVE-2011-2526-rhbz-720948.patch
-Patch5: 			tomcat6-6.0.32-CVE-2011-3190-rhbz-738502.patch
-Patch6:			%{name}-6.0.32-CVE-2011-1184-rhbz-741407.patch
+#Patch3:        %{name}-6.0.32-CVE-2011-2204-rhbz-717016.patch
+#Patch4: 			tomcat6-6.0.32-CVE-2011-2526-rhbz-720948.patch
+#Patch5: 			tomcat6-6.0.32-CVE-2011-3190-rhbz-738502.patch
+#Patch6:			%{name}-6.0.32-CVE-2011-1184-rhbz-741407.patch
 
 BuildArch:     noarch
 
@@ -233,13 +233,13 @@ 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
+#%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
+%{__ln_s} $(build-classpath jakarta-taglibs-standard) webapps/examples/WEB-INF/lib/standard.#jar
 
 %build
 export OPT_JAR_LIST="xalan-j2-serializer"
@@ -632,6 +632,9 @@ fi
 %{appdir}/sample
 
 %changelog
+* Thu May 3 2012 David Knox <dknox at redhat.com> 0:6.0.35-1
+- Update to 6.0.35
+
 * Thu Oct 20 2011 David Knox <dknox at redhat.com> 0:6.0.32-19
 - Corrected patch name from CVE-2011-1183 to CVE-2011-1184. 
 - The entry below should b 2011-1184 versus 1138