[java-1.6.0-openjdk/f15/master] Configure updated for icedtea 1.10

[jiri vanek]

commit d1efa8709b5fd9bd501e9d2800159f8692212874
Author: Jiri Vanek <jvanek at dhcp-2-137.brq.redhat.com>
Date:   Wed Mar 9 07:56:11 2011 +0100

    Configure updated for icedtea 1.10

 .gitignore              |    1 +
 java-1.6.0-openjdk.spec |   28 ++++++++++++++--------------
 sources                 |    2 +-
 3 files changed, 16 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cb0575a..9a4f775 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ icedtea6-1.8.tar.gz
 /openjdk-6-src-b22-28_feb_2011.tar.gz
 /jaxp144_01.zip
 /icedtea6-1.10.tar.gz
+/hotspot.tar.gz
diff --git a/java-1.6.0-openjdk.spec b/java-1.6.0-openjdk.spec
index 97ed8c0..955269c 100644
--- a/java-1.6.0-openjdk.spec
+++ b/java-1.6.0-openjdk.spec
@@ -1,15 +1,15 @@
 #nd If gcjbootstrap is 1 IcedTea is bootstrapped against
 # java-1.5.0-gcj-devel.  If gcjbootstrap is 0 IcedTea is built against
 # java-1.6.0-openjdk-devel.
-%define gcjbootstrap 1
+%define gcjbootstrap 0
 
 # If runtests is 0 test suites will not be run.
 %define runtests 0
 
-%define icedteaver 1.9.7
+%define icedteaver 1.10
 %define icedteasnapshot %{nil}
-%define openjdkver b20
-%define openjdkdate 21_jun_2010
+%define openjdkver b22
+%define openjdkdate 28_feb_2011
 
 %define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/
 
@@ -25,7 +25,7 @@
 
 %define openjdkurlbase http://www.java.net/download/openjdk/jdk6/promoted/
 %define openjdkurl %{openjdkurlbase}%{openjdkver}/
-%define fedorazip  openjdk-6-src-%{openjdkver}-%{openjdkdate}-fedora.tar.gz
+%define fedorazip  openjdk-6-src-%{openjdkver}-%{openjdkdate}.tar.gz
 
 %define mauvedate 2008-10-22
 
@@ -72,9 +72,9 @@
 %endif
 %else
 %ifarch %{jit_arches}
-%define icedteaopt --with-openjdk --enable-systemtap
+%define icedteaopt --with-jdk-home=/usr/lib/jvm/java-openjdk --enable-systemtap
 %else
-%define icedteaopt --with-openjdk
+%define icedteaopt --with-jdk-home=/usr/lib/jvm/java-openjdk
 %endif
 %endif
 
@@ -164,14 +164,14 @@ Source3:  %{genurl}generate-fedora-zip.sh
 Source4:  README.src
 Source5:  mauve-%{mauvedate}.tar.gz
 Source6:  mauve_tests
-Source7:  %{hotspoturl}13edc857b967.tar.gz
-Source8:  %{jaxpurl}jdk6-jaxp-%{openjdkver}.zip
-Source9:  %{jafurl}jdk6-jaf-%{openjdkver}.zip
-Source10: %{jaxwsurl}jdk6-jaxws-%{openjdkver}.zip
+Source7:  %{hotspoturl}hotspot.tar.gz
+Source8:  %{jaxpurl}jaxp144_01.zip
+Source9:  %{jafurl}jdk6-jaf-b20.zip
+Source10: %{jaxwsurl}jdk6-jaxws-b20.zip
 # FIXME: This patch needs to be fixed. optflags argument
 # -mtune=generic is being ignored because it breaks several graphical
 # applications.
-Patch0:   java-1.6.0-openjdk-optflags.patch
+#Patch0:   java-1.6.0-openjdk-optflags.patch
 Patch1:   java-1.6.0-openjdk-java-access-bridge-tck.patch
 Patch2:   java-1.6.0-openjdk-java-access-bridge-idlj.patch
 Patch3:	  java-1.6.0-openjdk-java-access-bridge-security.patch
@@ -383,7 +383,7 @@ The OpenJDK web browser plugin.
 %setup -q -n icedtea6-%{icedteaver}
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 5
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 2
-%patch0
+#%patch0
 cp %{SOURCE4} .
 cp %{SOURCE6} .
 
@@ -398,7 +398,7 @@ export CFLAGS="$CFLAGS -mieee"
 ./autogen.sh
 ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} \
   --with-pkgversion=fedora-%{release}-%{_arch} --enable-pulse-java \
-  --with-hotspot-build=hs19 --with-hotspot-src-zip=%{SOURCE7} \
+  --with-hotspot-build=hs20 --with-hotspot-src-zip=%{SOURCE7} \
   --with-jaf-drop-zip=%{SOURCE9} \
   --with-jaxp-drop-zip=%{SOURCE8} --with-jaxws-drop-zip=%{SOURCE10} \
   --with-abs-install-dir=%{_jvmdir}/%{sdkdir}
diff --git a/sources b/sources
index 462cb26..25b37d1 100644
--- a/sources
+++ b/sources
@@ -5,5 +5,5 @@ c12f124672a97c7491530fed2c0facdc  java-access-bridge-1.23.0.tar.bz2
 ef7a8b3624ea904bf584bc46d79b5e75  jaxp144_01.zip
 91adfd41e6f001add4f92ae31216b1e3  jdk6-jaxws-b20.zip
 bc95c133620bd68c161cac9891592901  jdk6-jaf-b20.zip
-3171888f17698d8e9348f8b3e813d20d  13edc857b967.tar.gz
+2791c8009eefee305538c81328a8dfd2  hotspot.tar.gz
 fd3f35e8a8a2ef9a64c035ed66cea06d  icedtea6-1.10.tar.gz