[tomcat6/f16] Use (R) java and (BR) java-devel versus (R) java-1.6.0 and (BR) java-devel-1.6.0

[Dave Knox]

commit abd5bb5137fb8ce053de435b784a3caedf65d3cb
Author: David Knox <dknox at dknox-laptop.(none)>
Date:   Wed Aug 10 12:35:14 2011 -0600

    Use (R) java and (BR) java-devel versus (R) java-1.6.0 and (BR) java-devel-1.6.0

 tomcat6.spec |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/tomcat6.spec b/tomcat6.spec
index 552b4f5..6e33497 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -53,7 +53,7 @@
 Name:          tomcat6
 Epoch:         0
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       11%{?dist}
+Release:       13%{?dist}
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 Group:         Networking/Daemons
@@ -75,6 +75,7 @@ Patch1:        %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.pat
 # 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
 
 BuildArch:     noarch
 
@@ -87,7 +88,8 @@ BuildRequires: jakarta-commons-daemon
 BuildRequires: jakarta-commons-dbcp
 BuildRequires: jakarta-commons-pool
 BuildRequires: jakarta-taglibs-standard
-BuildRequires: java-1.6.0-devel
+# BuildRequires: java-1.6.0-devel
+BuildRequires: java-devel
 BuildRequires: jpackage-utils >= 0:1.7.0
 BuildRequires: junit
 BuildRequires: log4j
@@ -96,7 +98,8 @@ Requires:      jakarta-commons-logging
 Requires:      jakarta-commons-collections
 Requires:      jakarta-commons-dbcp
 Requires:      jakarta-commons-pool
-Requires:      java-1.6.0
+# Requires:      java-1.6.0
+Requires:      java
 Requires:      procps
 Requires:      %{name}-lib = %{epoch}:%{version}-%{release}
 Requires(pre):    shadow-utils
@@ -214,6 +217,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
 %patch1 -p0
 # %patch2 -p0
 %patch3 -p0
+%patch4 -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
@@ -583,6 +587,13 @@ fi
 %{appdir}/sample
 
 %changelog
+* Wed Aug 10 2011 David Knox <dknox at redhat.com> 0:6.0.32-13
+- Resolves use java-devel and java instead of BR java-1.6.0-devel
+- and R java-1.6.0
+
+* Mon Aug 1 2011 David Knox <dknox at redhat.com> 0:6.0.32-12
+- Resolves CVE-2011-2526
+
 * Tue Jul 5 2011 David Knox <dknox at redhat.com> 0:6.0.32-11
 - Resolves rhbz 677414 update deletes workdir and tempdir