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

Changed files:
    tomcat-native.spec -> 1.12

diff --git a/tomcat-native.spec b/tomcat-native.spec
index a9a3542ae267a6daa7ac355327122e66b9d69cf7..1bc3cdfc396c349aca9ad7bed9d69d86e9d1830d 100644 (file)
--- a/tomcat-native.spec
+++ b/tomcat-native.spec
@@ -17,13 +17,14 @@ BuildRequires:      ant
 BuildRequires: apr-devel
 BuildRequires: autoconf
 BuildRequires: automake
 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
 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)
 
 ExclusiveArch: i586 i686 pentium3 pentium4 athlon %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)