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

Changed files:
    subversion.spec -> 1.276

diff --git a/subversion.spec b/subversion.spec
index 3320cbf262b757773892c16d7c2776acbe89d15c..3d94051dbb756c7b84b85a4315d7357195531f28 100644 (file)
--- a/subversion.spec
+++ b/subversion.spec
@@ -1,5 +1,4 @@
 # TODO:
-# - fix java build with java-gcj-compat and s/java-sun/jdk/
 # - remove net_client_only and add db bcond (then without apache and
 #   without db => net_client_only - spec will be more simpler, I think)
 # - finish ruby
@@ -17,10 +16,6 @@
 %bcond_without kwallet                 # build without kde4 wallet support
 %bcond_without gnome                   # build without gnome keyring support
 #
-%ifnarch i586 i686 pentium3 pentium4 athlon %{x8664}
-%undefine      with_javahl
-%endif
-#
 %{!?with_net_client_only:%include      /usr/lib/rpm/macros.perl}
 %define        apxs    /usr/sbin/apxs
 %define        pdir    SVN
@@ -76,8 +71,7 @@ BuildRequires:        ruby-devel
 BuildRequires: swig-ruby >= 1.3.24
 %endif
 %if %{with javahl}
-BuildRequires: java-sun
-BuildRequires: java-sun-tools
+BuildRequires: jdk
 %endif
 BuildRequires: cyrus-sasl-devel
 %endif