From 7d94ff05d4dfdb052097e72a5db9f40d194463cc Mon Sep 17 00:00:00 2001 From: pawelz Date: Sat, 17 Apr 2010 22:48:02 +0000 Subject: [PATCH] - we no longer want to force gcj for th Changed files: java.spec -> 1.46 --- java.spec | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/java.spec b/java.spec index f29f726..19981fb 100644 --- a/java.spec +++ b/java.spec @@ -4,12 +4,6 @@ %bcond_without source # don't build source jar %bcond_without tests # don't build and run tests -%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 # Name without java- prefix. If it is application, not a library, @@ -31,10 +25,8 @@ URL: - %if %(locale -a | grep -q '^en_US$'; echo $?) BuildRequires: glibc-localedb-all %endif -%{!?with_java_sun:BuildRequires: java-gcj-compat-devel} -%{?with_java_sun:BuildRequires: java-sun} +BuildRequires: jdk BuildRequires: jpackage-utils -BuildRequires: rpm >= 4.4.9-56 BuildRequires: rpm-javaprov BuildRequires: rpmbuild(macros) >= 1.300 # for %%undos macro -- 2.44.0