[java-1.6.0-openjdk/f14/master] - Temporarily resolve rhbz#647737: - Put hs19 back, but disable Compressed Oops

[Deepak Bhole]

commit 56210a79816a7045ec264279a0a32afdb5621847
Author: Deepak Bhole <dbhole at tocatta.(none)>
Date:   Tue Nov 9 00:20:13 2010 -0500

    - Temporarily resolve rhbz#647737:
      - Put hs19 back, but disable Compressed Oops

 java-1.6.0-openjdk.spec |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/java-1.6.0-openjdk.spec b/java-1.6.0-openjdk.spec
index 5c28373..581b920 100644
--- a/java-1.6.0-openjdk.spec
+++ b/java-1.6.0-openjdk.spec
@@ -137,7 +137,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 45.%{icedteaver}%{?dist}
+Release: 46.%{icedteaver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -173,6 +173,9 @@ Patch2:   java-1.6.0-openjdk-java-access-bridge-idlj.patch
 Patch3:	  java-1.6.0-openjdk-java-access-bridge-security.patch
 Patch4:   java-1.6.0-openjdk-accessible-toolkit.patch
 
+# Temporary patches intended for removal in short term
+Patch100: %{name}-bz647737.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: alsa-lib-devel
@@ -380,6 +383,7 @@ The OpenJDK web browser plugin.
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 5
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 2
 %patch0
+%patch100
 cp %{SOURCE4} .
 cp %{SOURCE6} .
 
@@ -394,6 +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-jaf-drop-zip=%{SOURCE9} \
   --with-jaxp-drop-zip=%{SOURCE8} --with-jaxws-drop-zip=%{SOURCE10} \
   --with-abs-install-dir=%{_jvmdir}/%{sdkdir}
@@ -948,6 +953,10 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Mon Nov 08 2010 Deepak Bhole <dbhole at redhat.com> - 1:1.6.0.0-46.1.9.1
+- Temporarily resolve rhbz#647737:
+  - Put hs19 back, but disable Compressed Oops
+
 * Mon Nov 08 2010 Deepak Bhole <dbhole at redhat.com> - 1:1.6.0.0-45.1.9.1
 - Temporarily resolve rhbz#647737:
   - Build with default hotspot (hs17)