From 99a4b5c87a29887dcad9bcc49851cb4f32385c05 Mon Sep 17 00:00:00 2001
From: Jacek Konieczny <jajcus@pld-linux.org>
Date: Sat, 17 Apr 2010 07:44:36 +0000
Subject: [PATCH] - do not pull java-sun via BR - icedtea6 should be enough in
 all (most) cases

Changed files:
    tomcat-native.spec -> 1.12
---
 tomcat-native.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tomcat-native.spec b/tomcat-native.spec
index a9a3542..1bc3cdf 100644
--- a/tomcat-native.spec
+++ b/tomcat-native.spec
@@ -17,13 +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
+BuildConflicts:	java-gcj-compat
 ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-- 
2.43.0