SPECS: icedtea.spec - require gcc-java 4.3; drop java-sun bcond (w...

[arekm]

Author: arekm                        Date: Tue Mar 11 07:56:41 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- require gcc-java 4.3; drop java-sun bcond (we need gcc one for ppc so java-sun isn't for us)

---- Files affected:
SPECS:
   icedtea.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/icedtea.spec
diff -u SPECS/icedtea.spec:1.9 SPECS/icedtea.spec:1.10
--- SPECS/icedtea.spec:1.9	Tue Mar 11 08:17:27 2008
+++ SPECS/icedtea.spec	Tue Mar 11 08:56:36 2008
@@ -2,8 +2,6 @@
 # TODO:
 # - fix bash substitution
 #
-%bcond_with	java_sun
-#
 Summary:	OpenJDK and GNU Classpath code
 SummarY(pl.UTF-8):	Kod OpenJDK i GNU Classpath
 Name:		icedtea
@@ -22,7 +20,7 @@
 BuildRequires:	cups-devel
 BuildRequires:	eclipse-ecj
 BuildRequires:	freetype-devel
-BuildRequires:	gcc-java
+BuildRequires:	gcc-java >= 6:4.3
 BuildRequires:	giflib-devel
 BuildRequires:	glib2-devel
 BuildRequires:	gtk+2-devel
@@ -43,10 +41,6 @@
 BuildRequires:	xorg-proto-xproto-devel
 BuildRequires:	xulrunner-devel
 BuildRequires:	zlib-devel
-%if %{with java_sun}
-BuildRequires:	java-sun-jre
-BuildRequires:	jpackage-utils
-%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -79,7 +73,6 @@
 	--with-openjdk-src=${PWD}/openjdk
 
 %{__make} -j1 \
-	%{?with_java_sun:BOOTDIR=%{java_home}} \
 	SHELL=/bin/bash
 
 %install
@@ -100,6 +93,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2008-03-11 07:56:36  arekm
+- require gcc-java 4.3; drop java-sun bcond (we need gcc one for ppc so java-sun isn't for us)
+
 Revision 1.9  2008-03-11 07:17:27  arekm
 - don't specify tarball (so build system won't try to unpack it on it's own)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/icedtea.spec?r1=1.9&r2=1.10&f=u