template-specs: java.spec - we no longer want to force gcj for th

[pawelz]

Author: pawelz                       Date: Sat Apr 17 22:48:07 2010 GMT
Module: template-specs                Tag: HEAD
---- Log message:
- we no longer want to force gcj for th

---- Files affected:
template-specs:
   java.spec (1.45 -> 1.46) 

---- Diffs:

================================================================
Index: template-specs/java.spec
diff -u template-specs/java.spec:1.45 template-specs/java.spec:1.46
--- template-specs/java.spec:1.45	Thu Apr 15 01:11:27 2010
+++ template-specs/java.spec	Sun Apr 18 00:48:02 2010
@@ -5,12 +5,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,
@@ -32,10 +26,8 @@
 %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
@@ -213,6 +205,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2010/04/17 22:48:02  pawelz
+- we no longer want to force gcj for th
+
 Revision 1.45  2010/04/14 23:11:27  pawelz
 - source subpackage example
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/template-specs/java.spec?r1=1.45&r2=1.46&f=u