- Don't force specific jdk.

Changed files:
    db4.8.spec -> 1.5

diff --git a/db4.8.spec b/db4.8.spec
index 153a72218338888698e815ff70b6caf373f09f90..d857fac790a9bf7b536f6e3c1dade6cd46fc3c57 100644 (file)
--- a/db4.8.spec
+++ b/db4.8.spec
@@ -4,12 +4,6 @@
 %bcond_without tcl             # don't build Tcl bindings
 %bcond_without static_libs     # don't build static libraries
 
 %bcond_without tcl             # don't build Tcl bindings
 %bcond_without static_libs     # don't build static libraries
 

-%if "%{pld_release}" == "ti"
-%bcond_without java_sun        # build with gcj
-%else
-%bcond_with    java_sun        # build with java-sun
-%endif
-

 %include       /usr/lib/rpm/macros.java
 
 %define                libver          4.8
 %include       /usr/lib/rpm/macros.java
 
 %define                libver          4.8


@@ -29,9 +23,7 @@ Source0:      http://download.oracle.com/berkeley-db/db-%{ver}.tar.gz
 URL:           http://www.oracle.com/technology/products/berkeley-db/index.html
 BuildRequires: automake
 %if %{with java}
 URL:           http://www.oracle.com/technology/products/berkeley-db/index.html
 BuildRequires: automake
 %if %{with java}

-%{!?with_java_sun:BuildRequires:       java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires:        java-sun}
-BuildRequires: rpm >= 4.4.9-56
+BuildRequires: jdk

 BuildRequires: rpm-javaprov
 %endif
 BuildRequires: libstdc++-devel
 BuildRequires: rpm-javaprov
 %endif
 BuildRequires: libstdc++-devel