Merge branch 'f21'

Conflicts:
	enableArm64.patch
	java-1.8.0-openjdk.spec

enableArm64.patch

@@ -1,8 +1,8 @@
 --- /dev/null
 +++ jdk8/jdk/src/solaris/bin/aarch64/jvm.cfg
 @@ -0,0 +1,2 @@
-+-client IGNORE
 +-server KNOWN
++-client IGNORE
 --- jdk8/common/autoconf/generated-configure.sh
 +++ jdk8/common/autoconf/generated-configure.sh
 @@ -6728,8 +6728,9 @@

java-1.8.0-openjdk.spec

@@ -135,7 +135,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}
-Release: 7.%{buildver}%{?dist}
+Release: 8.%{buildver}%{?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
@@ -1157,6 +1157,9 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/accessibility.properties
 
 %changelog
+* Tue Jul 22 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.11-8.b12
+- Modify aarch64-specific jvm.cfg to list server vm first
+
 * Mon Jul 21 2014 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.11-7.b12
 - removed legacy aarch64 switches
  - --with-jvm-variants=client and  --disable-precompiled-headers