- Dropped EA, we have icedtea6 jdk on all archs

[packages/tomcat-native.git] / tomcat-native.spec

diff --git a/tomcat-native.spec b/tomcat-native.spec
index 88eb607ce624d823aba225e49f3ce550a63bdf3d..716765c0b3f24c432cd6d5259812ec0d3fe96836 100644 (file)
--- a/tomcat-native.spec
+++ b/tomcat-native.spec
@@ -7,7 +7,7 @@ Summary:        Native Tomcat Connector based on APR
 Summary(pl.UTF-8):     Natywny Connector Tomcata oparty o APR
 Name:          tomcat-native
 Version:       1.1.20
-Release:       1
+Release:       2
 License:       Apache v2
 Group:         Libraries
 Source0:       http://www.apache.org/dist/tomcat/tomcat-connectors/native/%{version}/source/%{name}-%{version}-src.tar.gz
@@ -17,14 +17,14 @@ BuildRequires:      ant
 BuildRequires: apr-devel
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: java-sun
+BuildRequires: jdk
 BuildRequires: jpackage-utils
 BuildRequires: libtool
 BuildRequires: openssl-devel
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpm-javaprov
 BuildRequires: rpmbuild(macros) >= 1.300
-ExclusiveArch: i586 i686 pentium3 pentium4 athlon %{x8664}
+BuildConflicts:        java-gcj-compat
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description