- Don't force specific jdk.

Changed files:
    ice.spec -> 1.25

diff --git a/ice.spec b/ice.spec
index 7a15cf9f74f5461a9f2d957edfbb5b225ec1e972..f72c015fd3a03cda84493047ed8cd3b5b423607e 100644 (file)
--- a/ice.spec
+++ b/ice.spec
@@ -9,12 +9,6 @@
 %bcond_without python          # Python bindings
 %bcond_without ruby            # Ruby bindings
 
-%if "%{pld_release}" == "ti"
-%bcond_without java_sun        # build with gcj
-%else
-%bcond_with    java_sun        # build with java-sun
-%endif
-
 %if %{without java}
 %undefine      with_gui
 %endif
@@ -46,7 +40,6 @@ BuildRequires:        db-cxx-devel
 BuildRequires: expat-devel
 BuildRequires: mcpp-devel
 BuildRequires: openssl-devel
-BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpmbuild(macros) >= 1.533
 %if %{with gui}
 BuildRequires: ImageMagick
@@ -58,10 +51,9 @@ BuildRequires:       mono-csharp
 %if %{with java}
 BuildRequires: ant-nodeps
 BuildRequires: db-java-devel
-%{!?with_java_sun:BuildRequires:       java-gcj-compat-devel}
 BuildRequires: java-jgoodies-forms
 BuildRequires: java-jgoodies-looks
-%{?with_java_sun:BuildRequires:        java-sun}
+BuildRequires: jdk
 BuildRequires: jpackage-utils
 BuildRequires: rpm-javaprov
 %endif