[java-1.7.0-openjdk/f20] arm tarball updated to new CPU sources 2.3.13 - removed upstreamed patch 501 callerclass-01.patch

[jiri vanek]

commit fe4d107e6fc3716d056e93c592469841179d922d
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date:   Fri Oct 18 10:54:47 2013 +0200

    arm tarball updated to new  CPU sources 2.3.13
    - removed upstreamed  patch 501 callerclass-01.patch
    - removed upstreamed  patch 502 callerclass-02.patch
    - removed upstreamed  patch 503 callerclass-02.patch
    - removed upstreamed  patch 504 callerclass-02.patch

 .gitignore              |    1 +
 callerclass-01.patch    |   76 ----------------------
 callerclass-02.patch    |  161 -----------------------------------------------
 callerclass-03.patch    |   40 ------------
 callerclass-04.patch    |  117 ----------------------------------
 java-1.7.0-openjdk.spec |   24 +++-----
 sources                 |    2 +-
 7 files changed, 11 insertions(+), 410 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 051ca65..e58a440 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@
 /openjdk-icedtea-2.4.2.tar.xz
 /systemtap-tapset-2013-10-02.tar.gz
 /openjdk-icedtea-2.4.3.tar.xz
+/openjdk-icedtea-2.3.13.tar.xz
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index 1fca884..e1beb47 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -2,7 +2,7 @@
 %global debug 0
 
 %global icedtea_version 2.4.3
-%global icedtea_version_arm32 2.3.12
+%global icedtea_version_arm32 2.3.13
 %global hg_tag icedtea-{icedtea_version}
 
 %global aarch64			aarch64 arm64 armv8
@@ -150,7 +150,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.60
-Release: %{icedtea_version}.0%{?dist}
+Release: %{icedtea_version}.1%{?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
@@ -278,12 +278,6 @@ Patch4020: gstackbounds-2.3.patch
 Patch403: PStack-808293.patch
 # End of tmp patches
 
-# Temporary backport of patches already upstream but not in a icedtea7-2.3.X release yet
-Patch501: callerclass-01.patch
-Patch502: callerclass-02.patch
-Patch503: callerclass-03.patch
-Patch504: callerclass-04.patch
-
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gcc-c++
@@ -574,13 +568,6 @@ tar xzf %{SOURCE9}
 %patch403
 %endif
 
-%ifarch %{arm}
-%patch501
-%patch502
-%patch503
-%patch504
-%endif
-
 %build
 # How many cpu's do we have?
 %ifarch aarch64
@@ -1447,6 +1434,13 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/accessibility.properties
 
 %changelog
+* Fri Oct 18 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.40-2.4.3.1.f20
+- arm tarball updated to new  CPU sources 2.3.13
+- removed upstreamed  patch 501 callerclass-01.patch
+- removed upstreamed  patch 502 callerclass-02.patch
+- removed upstreamed  patch 503 callerclass-02.patch
+- removed upstreamed  patch 504 callerclass-02.patch
+
 * Thu Oct 17 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.40-2.4.3.0.f20
 - updated to new  CPU sources 2.4.3
 - jdk splitted to headless and rest
diff --git a/sources b/sources
index 7059ab1..89fc501 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 ea344cc5b53b73f375558ba41760ff64  class-rewriter.tar.gz
 1cb61996cf5dbe80827abbe7d009bf28  pulseaudio.tar.gz
 785b5ff80beef8cc095e25345c6c8242  systemtap-tapset-2013-10-02.tar.gz
-8d4f3df0b264c331187696bb49306634  openjdk-icedtea-2.3.12.tar.xz
+504e643fb84f53f2bd7cdf944737ad63  openjdk-icedtea-2.3.13.tar.xz
 fd22afba9cc55754abcd584aa0b9aaaa  openjdk-icedtea-2.4.3.tar.xz