[tomcat6] Changed R and BR so the version of java is not specified

Dave Knox dknox at fedoraproject.org
Thu Aug 11 16:30:44 UTC 2011


commit 2462f5300c35b5665f220ad99048ecaab789cf05
Author: David Knox <dknox at dknox-laptop.(none)>
Date:   Thu Aug 11 10:30:51 2011 -0600

    Changed R and BR so the version of java is not specified

 tomcat6.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/tomcat6.spec b/tomcat6.spec
index b6ceb34..9cf78e7 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -53,7 +53,7 @@
 Name:          tomcat6
 Epoch:         0
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       12%{?dist}
+Release:       13%{?dist}
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 Group:         Networking/Daemons
@@ -89,7 +89,7 @@ BuildRequires: jakarta-commons-daemon
 BuildRequires: jakarta-commons-dbcp
 BuildRequires: jakarta-commons-pool
 BuildRequires: jakarta-taglibs-standard
-BuildRequires: java-1.6.0-devel
+BuildRequires: java-devel
 BuildRequires: jpackage-utils >= 0:1.7.0
 BuildRequires: junit
 BuildRequires: log4j
@@ -98,7 +98,7 @@ Requires:      jakarta-commons-logging
 Requires:      jakarta-commons-collections
 Requires:      jakarta-commons-dbcp
 Requires:      jakarta-commons-pool
-Requires:      java-1.6.0
+Requires:      java
 Requires:      procps
 Requires:      %{name}-lib = %{epoch}:%{version}-%{release}
 Requires(pre):    shadow-utils
@@ -586,6 +586,10 @@ fi
 %{appdir}/sample
 
 %changelog
+* Thu Aug 11 2011 David Knox <dknox at redhat.com> 0:6.0.32-13
+- Resolves: Java BR and R changed to java-devel and java versus
+- specifically using java 1.6
+
 * Wed Jul 27 2011 David Knox <dknox at redhat.com> 0:6.0.32-12
 - Resolves: CVE-2011-2526
  


More information about the scm-commits mailing list