- do not pull java-sun via BR - icedtea6 should be enough in all (most) cases

Changed files:
    tomcat.spec -> 1.161

diff --git a/tomcat.spec b/tomcat.spec
index b40d3b34fb91527f51ea0b6abdca6de31f61a587..8a4dbba0974acd394eedf6d8c557882d9905e1e2 100644 (file)
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -32,7 +32,7 @@ URL:          http://tomcat.apache.org/
 BuildRequires: java-sun >= 1.5
 BuildRequires: java-sun-jre >= 1.5
 %else
-BuildRequires: java-gcj-compat-devel
+BuildRequires: icedtea6-jdk
 %endif
 BuildRequires: ant >= 1.5.3
 BuildRequires: ant-trax
@@ -62,7 +62,7 @@ Requires:     java-commons-dbcp-tomcat5 >= 0:1.1
 Requires:      java-commons-pool-tomcat5
 Requires:      java-jdbc-mysql
 Requires:      java-servletapi = %{epoch}:%{version}-%{release}
-Requires:      java-sun-jre >= 1.2
+Requires:      jre >= 1.2
 Requires:      jaxp_parser_impl
 Requires:      jndi >= 1.2.1
 Requires:      rc-scripts