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

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

diff --git a/tomcat-native.spec b/tomcat-native.spec
index d92a5e968e6e6d195b21af61242a796919c116d7..1bc3cdfc396c349aca9ad7bed9d69d86e9d1830d 100644 (file)
--- a/tomcat-native.spec
+++ b/tomcat-native.spec
@@ -6,24 +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.18
-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: 03701be390f81198ca4531ab4b0a8f35
+# 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
+BuildConflicts:        java-gcj-compat
 ExclusiveArch: i586 i686 pentium3 pentium4 athlon %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)