SPECS: icedtea.spec - doesn't bootstrap; requires newer gcj than t...

[arekm]

Author: arekm                        Date: Wed Nov 21 17:34:02 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- doesn't bootstrap; requires newer gcj than the one in gcc 4.2.2

---- Files affected:
SPECS:
   icedtea.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/icedtea.spec
diff -u SPECS/icedtea.spec:1.3 SPECS/icedtea.spec:1.4
--- SPECS/icedtea.spec:1.3	Sat Jul  7 00:58:58 2007
+++ SPECS/icedtea.spec	Wed Nov 21 18:33:57 2007
@@ -2,9 +2,7 @@
 # TODO:
 # - fix bash substitution
 #
-%bcond_without	bootstrap	# don't perform bootstrap build
-#
-%define	snap	20070626
+%define	snap	20071121
 Summary:	OpenJDK and GNU Classpath code
 SummarY(pl.UTF-8):	Kod OpenJDK i GNU Classpath
 Name:		icedtea
@@ -12,26 +10,37 @@
 Release:	0.%{snap}.1
 License:	GPL
 Group:		Development/Languages/Java
-Source0:	%{name}-%{snap}.tar.gz
-# Source0-md5:	8a7d2c92662b06c31dc4ada65004a508
-Source1:	http://download.java.net/openjdk/jdk7/promoted/b14/openjdk-7-ea-src-b14-21_jun_2007.zip
-# Source1-md5:	c126a32966e4bdb6a60a5724d9447966
+Source0:	%{name}-%{snap}.tar.bz2
+# Source0-md5:	37b772fd0c9e0c2779d6fb59ec2a2cfc
+Source1:	http://download.java.net/openjdk/jdk7/promoted/b23/openjdk-7-ea-src-b23-30_oct_2007.zip
+# Source1-md5:	7eed137c0321e0b5b75ff2d646ce0d0d
 URL:		http://icedtea.classpath.org/wiki/Main_Page
+BuildRequires:	alsa-lib-devel
 BuildRequires:	bash
 BuildRequires:	cups-devel
 BuildRequires:	eclipse-ecj
-BuildRequires:	findutils
+BuildRequires:	freetype-devel
+BuildRequires:	gcc-java
+BuildRequires:	giflib-devel
+BuildRequires:	glib2-devel
+BuildRequires:	gtk+2-devel
 BuildRequires:	jdk
 BuildRequires:	libgcj
+BuildRequires:	libjpeg-devel
+BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	motif-devel
 BuildRequires:	unzip
 BuildRequires:	xalan-j
 BuildRequires:	xerces-j
 BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXinerama-devel
 BuildRequires:	xorg-lib-libXt-devel
+BuildRequires:	xorg-lib-libXtst-devel
 BuildRequires:	xorg-proto-printproto-devel
 BuildRequires:	xorg-proto-xproto-devel
+BuildRequires:	xulrunner-devel
+BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -49,9 +58,8 @@
 %prep
 %setup -q -n %{name} -a1
 
-sed -i -e 's#-Werror##g' openjdk/hotspot/build/linux/makefiles/gcc.make openjdk/j2se/make/common/*.gmk
-
 %build
+unset JAVA_HOME || :
 %configure \
 	--with-ecj-jar=%{_javadir}/ecj.jar \
 	--with-libgcj-jar=%{_javadir}/libgcj.jar \
@@ -61,9 +69,8 @@
 	--with-openjdk-src-zip=%{SOURCE1} \
 	--with-openjdk-src=${PWD}/openjdk
 
-%{__make} -j1 %{?with_bootstrap:bootstrap} \
-	SHELL=/bin/bash \
-	BOOTDIR=%{java_home}
+%{__make} -j1 \
+	SHELL=/bin/bash
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -83,7 +90,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.3  2007-07-06 22:58:58  qboosh
+Revision 1.4  2007-11-21 17:33:57  arekm
+- doesn't bootstrap; requires newer gcj than the one in gcc 4.2.2
+
+Revision 1.3  2007/07/06 22:58:58  qboosh
 - pl
 
 Revision 1.2  2007/06/26 21:51:15  arekm
================================================================

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