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

Changed files:
    java-avalon-framework.spec -> 1.20

diff --git a/java-avalon-framework.spec b/java-avalon-framework.spec
index a5c629ffcc4807a7f947c0023aaea27d1e26209c..45a7dfadcd21ee941ca500c390943828e5134d3c 100644 (file)
--- a/java-avalon-framework.spec
+++ b/java-avalon-framework.spec
@@ -24,7 +24,8 @@ BuildRequires:        java-avalon-logkit
 BuildRequires: java-commons-logging
 %{?with_tests:BuildRequires:   java-junit}
 BuildRequires: java-log4j
-BuildRequires: java-sun
+BuildRequires: jdk
+BuildConflicts:        java-gcj-compat-devel
 BuildRequires: jpackage-utils
 BuildRequires: rpm-javaprov
 BuildRequires: rpmbuild(macros) >= 1.300