[java-1.7.0-openjdk/f17] Updated to 2.3.6

[Deepak Bhole]

commit 6eed66c2a31dfe219d33275be7764d31e1971f2e
Author: Deepak Bhole <dbhole at redhat.com>
Date:   Thu Feb 14 16:32:41 2013 -0500

    Updated to 2.3.6
    
    Updated the 2.1.5 tarball
    Removed upstreamed patches

 .gitignore              |    1 +
 java-1.7.0-openjdk.spec |   28 +++++++---------------------
 sources                 |    4 ++--
 3 files changed, 10 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f331f12..4002744 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
 /openjdk-icedtea-2.3.5pre.tar.gz
 /openjdk-icedtea-2.3.5.tar.gz
 /openjdk-icedtea-2.1.5.tar.gz
+/openjdk-icedtea-2.3.6.tar.gz
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index d9d335b..7cba643 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -9,7 +9,7 @@
 # If runtests is 0 test suites will not be run.
 %global runtests 0
 
-%global icedtea_version 2.3.5
+%global icedtea_version 2.3.6
 %global hg_tag icedtea-{icedtea_version}
 
 %global accessmajorver 1.23
@@ -153,7 +153,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: %{icedtea_version}.4%{?dist}
+Release: %{icedtea_version}%{?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
@@ -422,17 +422,6 @@ Patch302: systemtap.patch
 # Rhino support
 Patch400: rhino-icedtea-2.1.1.patch
 
-# Temporary patches
-# Patch to fix regression caused by fix for 6664509
-# Upstreamed at http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk/rev/272466e46b3f
-Patch1000: sec-2013-02-01-8005615.patch
-# synchronize the files fixed by the above patch with
-# http://cr.openjdk.java.net/~ewendeli/jdk7u13-cpu/
-Patch1001: sec-2013-02-01-8005615-sync_with_jdk7u.patch
-
-# Back out 7201064 which breaks TCK
-Patch1010: sec-2013-02-01-7201064.patch
-
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: alsa-lib-devel
@@ -684,14 +673,6 @@ for TP in $TMPPATCHES ; do
   fi;
 done ;
 
-pushd openjdk/jdk/
-%ifarch %{jit_arches}
-%patch1000 -p1
-%patch1001 -p1
-%patch1010 -p1 -R
-%endif
-popd
-
 # If bootstrapping, apply additional patches
 %if %{gcjbootstrap}
 
@@ -1488,6 +1469,11 @@ exit 0
 %doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
 
 %changelog
+* Thu Feb 14 2013 Deepak Bhole <dbhole at redhat.com> - 1.7.0.9-2.3.6.fc17
+- Updated to 2.3.6
+- Updated the 2.1.5 tarball
+- Removed upstreamed patches
+
 * Mon Feb 11 2013 Deepak Bhole <dbhole at redhat.com> - 1.7.0.9-2.3.5.4.fc17
 - Updated secondary arch tarball to 2.1.5
 - Made Patch100* jit-arch specific-only (not needed for 2.1.5)
diff --git a/sources b/sources
index f58386f..4e2e02f 100644
--- a/sources
+++ b/sources
@@ -6,5 +6,5 @@ a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
 1cb61996cf5dbe80827abbe7d009bf28  pulseaudio.tar.gz
 8eb5ad93dbf2f4fe86e52631969cfb09  systemtap-tapset.tar.gz
 c5e790214585959e0d9f51fb5d9e98c6  tmp-patches-java-1.7.0-openjdk-f17.tar.gz
-8d6d0eef05255836e8f2d41608cf8496  openjdk-icedtea-2.1.5.tar.gz
-4e01315665ffcb3dab75846115f2520f  openjdk-icedtea-2.3.5.tar.gz
+223b1d36e531757eb7ce3c9e516fe930  openjdk-icedtea-2.1.5.tar.gz
+5116987ba4587de04f7fe3ecc59ac09a  openjdk-icedtea-2.3.6.tar.gz