- 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 fd7919b4ad00e86810094dd9c11639153e72ed4d..716765c0b3f24c432cd6d5259812ec0d3fe96836 100644 (file)
--- a/tomcat-native.spec
+++ b/tomcat-native.spec
@@ -6,25 +6,25 @@
 Summary:       Native Tomcat Connector based on APR
 Summary(pl.UTF-8):     Natywny Connector Tomcata oparty o APR
 Name:          tomcat-native
-Version:       1.1.19
-Release:       1
+Version:       1.1.20
+Release:       2
 License:       Apache v2
 Group:         Libraries
 Source0:       http://www.apache.org/dist/tomcat/tomcat-connectors/native/%{version}/source/%{name}-%{version}-src.tar.gz
-# Source0-md5: 074948724af48dd42dbda3c627471633
+# Source0-md5: fb2b9d073cb6575c2d0020eda266ca0c
 URL:           http://tomcat.apache.org/native-doc
 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