[java-1.6.0-openjdk] removed hotspot, now using default "inside-icedtea" one

[jiri vanek]

commit 30821a928fd99de9af2d894a58f9a3d99c24eb4c
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date:   Mon Jan 30 10:08:57 2012 +0100

    removed hotspot, now using default "inside-icedtea" one

 java-1.6.0-openjdk.spec |   13 +++++--------
 sources                 |    1 -
 2 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/java-1.6.0-openjdk.spec b/java-1.6.0-openjdk.spec
index 138ccb2..dff9a43 100644
--- a/java-1.6.0-openjdk.spec
+++ b/java-1.6.0-openjdk.spec
@@ -18,7 +18,6 @@
 %define accessver %{accessmajorver}.%{accessminorver}
 %define accessurl http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/
 
-%define hotspoturl http://hg.openjdk.java.net/hsx/hsx20/master/archive/
 %define jaxpurl     https://jaxp.dev.java.net/files/documents/913/150648/
 %define jafurl      https://jax-ws.dev.java.net/files/documents/4202/150725/
 %define jaxwsurl    https://jax-ws.dev.java.net/files/documents/4202/150724/
@@ -162,10 +161,9 @@ Source3:  %{genurl}generate-fedora-zip.sh
 Source4:  README.src
 Source5:  mauve-%{mauvedate}.tar.gz
 Source6:  mauve_tests
-Source7:  %{hotspoturl}hotspot.tar.gz
-Source8:  %{jaxpurl}jaxp144_03.zip
-Source9:  %{jafurl}jdk6-jaf-b20.zip
-Source10: %{jaxwsurl}jdk6-jaxws2_1_6-2011_06_13.zip
+Source7:  %{jaxpurl}jaxp144_03.zip
+Source8:  %{jafurl}jdk6-jaf-b20.zip
+Source9: %{jaxwsurl}jdk6-jaxws2_1_6-2011_06_13.zip
 # FIXME: This patch needs to be fixed. optflags argument
 # -mtune=generic is being ignored because it breaks several graphical
 # applications.
@@ -379,9 +377,8 @@ export CFLAGS="$CFLAGS -mieee"
 
 ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} \
   --with-pkgversion=fedora-%{release}-%{_arch} --enable-pulse-java \
-  --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-jaf-drop-zip=%{SOURCE7} \
+  --with-jaxp-drop-zip=%{SOURCE8} --with-jaxws-drop-zip=%{SOURCE8} \
   --with-abs-install-dir=%{_jvmdir}/%{sdkdir}
 %if %{gcjbootstrap}
 make stamps/patch-ecj.stamp
diff --git a/sources b/sources
index ca175c4..cebcf6d 100644
--- a/sources
+++ b/sources
@@ -1,7 +1,6 @@
 7a0c160c03012cd40957a7a112e25038  mauve_tests
 a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
 c12f124672a97c7491530fed2c0facdc  java-access-bridge-1.23.0.tar.bz2
-369ad745bf697d525d1a00fc09906829  hotspot.tar.gz
 781b3573d79921bb82785674a1c9dd8a  icedtea6-1.11pre.tar.gz
 9eea471ad474040265c688858fcf09aa  jaxp144_03.zip
 bc95c133620bd68c161cac9891592901  jdk6-jaf-b20.zip