From 38fbfcb25d485456b49973e9c5dd208bdcd46eed Mon Sep 17 00:00:00 2001
From: Denis Silakov <denis.silakov@rosalab.ru>
Date: Mon, 24 Aug 2015 12:33:47 +0400
Subject: [PATCH] Updated to jdk8u60-b16

---
 .abf.yml                |  4 +---
 java-1.8.0-openjdk.spec | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.abf.yml b/.abf.yml
index 9bc8bef..0fa31c8 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,6 +1,4 @@
 sources:
-  aarch64-port-jdk8-b128-aarch64-992.tar.xz: dc388a21e1e446ad72b72716831bf82493b18f9e
   jdk8-jdk8u45-b13-aarch64-jdk8u45-b13.tar.xz: 1f44e78df64b2f8722cf1bf5e3cde65bdd980be9
-  jdk8u-jdk8u5-b13.tar.xz: e05b8b3d45a5948eed9a629f410bfdfe7e474a12
-  jdk8u45-jdk8u45-b14.tar.xz: a6cf00b8730b18ae63305c886f1c08119dc46495
+  jdk8u-jdk8u60-b16.tar.xz: 7b02a21bd45ff54f0fb3286cf36d1a60b6e39b0a
   systemtap-tapset.tar.gz: 44444c943de42c8d08dbf6954cb05a5275d1fa56
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 06ee7fe..2515d1c 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -83,8 +83,8 @@
 
 # Standard JPackage naming and versioning defines.
 %global origin          openjdk
-%global updatever       45
-%global buildver        b14
+%global updatever       60
+%global buildver        b16
 %global aarch64_updatever 45
 %global aarch64_buildver b13
 %global aarch64_changesetid aarch64-jdk8u45-b13
@@ -150,7 +150,7 @@ URL:      http://openjdk.java.net/
 # Source from upstrem OpenJDK8 project. To regenerate, use
 # ./generate_source_tarball.sh jdk8u jdk8u jdk8u%{updatever}-%{buildver}
 # ./generate_source_tarball.sh aarch64-port jdk8 jdk8u%{aarch64_updatever}-%{aarch64_buildver}-aarch64
-Source0:  jdk8u%{updatever}-jdk8u%{updatever}-%{buildver}.tar.xz
+Source0:  jdk8u-jdk8u%{updatever}-%{buildver}.tar.xz
 Source1:  jdk8-jdk8u%{aarch64_updatever}-%{aarch64_buildver}-%{aarch64_changesetid}.tar.xz
 
 # Custom README for -src subpackage
@@ -222,14 +222,14 @@ Patch103: %{name}-ppc-zero-hotspot.patch
 Patch201: system-libjpeg.patch
 Patch202: system-libpng.patch
 Patch203: system-lcms.patch
-Patch204: zero-interpreter-fix.patch
+#Patch204: zero-interpreter-fix.patch
 
-Patch301: java-1.8.0-openjdk-giflib5.patch
+#Patch301: java-1.8.0-openjdk-giflib5.patch
 Patch302: java-1.8.0-openjdk-giflib5.1.patch
 
 # Fixed in upstream 9. See upstream bug:
 # https://bugs.openjdk.java.net/browse/JDK-8067331
-Patch402: atomic_linux_zero.inline.hpp.patch
+# Patch402: atomic_linux_zero.inline.hpp.patch
 # Fixes StackOverflowError on ARM32 bit Zero. See RHBZ#1206656
 Patch403: rhbz1206656_fix_current_stack_pointer.patch
 
@@ -438,7 +438,7 @@ sh %{SOURCE12}
 %patch201
 %patch202
 %patch203
-%patch204
+# % patch204
 
 %patch1
 %patch2
@@ -462,10 +462,10 @@ sh %{SOURCE12}
 %endif
 
 # omv patches
-%patch301
-%patch302
+# % patch301
+# % patch302
 
-%patch402
+# % patch402
 %patch403
 
 %patch501