From d0fed05d09456dd705a28de6ae1c40a338c2c438 Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@jvanek.redhat>
Date: Jun 19 2014 16:01:55 +0000
Subject: - added and applied as reverted patch404 gtk3ToBeReverted.patch

 - reverting controversial fix of http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=729

---

diff --git a/gtk3ToBeReverted.patch b/gtk3ToBeReverted.patch
new file mode 100644
index 0000000..0f0f08b
--- /dev/null
+++ b/gtk3ToBeReverted.patch
@@ -0,0 +1,25 @@
+
+# HG changeset patch
+# User andrew
+# Date 1402501898 -3600
+# Node ID cadc17b7e20ead881dd17a08f0df12da9dfae612
+# Parent  d26cf395f1f04d8e14f4f82e619079e1f598719d
+PR729: GTKLookAndFeel should be the system look&feel on all GNU/Linux desktops
+Summary: Return GTKLookAndFeel as the system look&feel on local GNU/Linux systems
+
+diff -r d26cf395f1f0 -r cadc17b7e20e src/share/classes/javax/swing/UIManager.java
+--- openjdk/jdk/src/share/classes/javax/swing/UIManager.java	Tue Jun 10 22:37:03 2014 +0100
++++ openjdk/jdk/src/share/classes/javax/swing/UIManager.java	Wed Jun 11 16:51:38 2014 +0100
+@@ -606,8 +606,9 @@
+         } else {
+             String desktop = AccessController.doPrivileged(new GetPropertyAction("sun.desktop"));
+             Toolkit toolkit = Toolkit.getDefaultToolkit();
+-            if ("gnome".equals(desktop) &&
+-                    toolkit instanceof SunToolkit &&
++            boolean gtkDesktop = "gnome".equals(desktop) ||
++              (osType == OSInfo.OSType.LINUX && SwingUtilities2.isLocalDisplay());
++            if (gtkDesktop && toolkit instanceof SunToolkit &&
+                     ((SunToolkit) toolkit).isNativeGTKAvailable()) {
+                 // May be set on Linux and Solaris boxs.
+                 return "com.sun.java.swing.plaf.gtk.GTKLookAndFeel";
+
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index 3813cba..9fb5b52 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -167,7 +167,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}
-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
@@ -288,6 +288,7 @@ Patch4030: PStack-808293-aarch64.patch
 # Add hardcoded RPATHS to ELF files
 Patch4120: add-final-location-rpaths-aarch64.patch
 # End of tmp patches
+Patch404: gtk3ToBeReverted.patch
 
 
 BuildRequires: autoconf
@@ -581,6 +582,11 @@ tar xzf %{SOURCE9}
 %patch4120
 %endif
 
+%ifnarch %{aarch64}
+#2.5(+?) forest specific
+%patch404 -R
+%endif
+
 
 %build
 # How many cpu's do we have?
@@ -1565,6 +1571,10 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/accessibility.properties
 
 %changelog
+* Thu Jun 19 2014 Jiri Vanek  <jvanek@redhat.com> - 1.7.0.60-2.5.0.1.f21
+- added and applied as reverted patch404 gtk3ToBeReverted.patch
+ - reverting controversial fix of http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=729
+
 * Wed Jun 18 2014 Jiri Vanek  <jvanek@redhat.com> - 1.7.0.60-2.5.0.f21
 - updated to icedtea7-forest 2.5.0
 - removed icedtea_version_presuffix