diff --git a/.gitignore b/.gitignore index a002ff7..d264e4b 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ /aarch64-port-jdk7u60-b04-aarch64-831.tar.xz /systemtap-tapset-2014-03-19.tar.xz /openjdk-icedtea-2.5pre04.tar.xz +/aarch64-port-jdk7u60-b04-aarch64-832.tar.xz diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec index 5a5e04d..00bdfce 100644 --- a/java-1.7.0-openjdk.spec +++ b/java-1.7.0-openjdk.spec @@ -5,7 +5,7 @@ %global icedtea_version 2.5 %global hg_tag icedtea-{icedtea_version} -%global aarch64_release 831 +%global aarch64_release 832 %global aarch64 aarch64 arm64 armv8 #sometimes we need to distinguish big and little endian PPC64 @@ -169,7 +169,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.60 -Release: %{icedtea_version}.0.21.%{icedtea_version_presuffix}%{?dist} +Release: %{icedtea_version}.0.22.%{icedtea_version_presuffix}%{?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 @@ -592,13 +592,8 @@ tar xzf %{SOURCE9} %build # How many cpu's do we have? -%ifarch aarch64 -# temporary until real hardware lands -export NUM_PROC=1 -%else export NUM_PROC=`/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :` export NUM_PROC=${NUM_PROC:-1} -%endif # Build IcedTea and OpenJDK. %ifarch s390x sparc64 alpha %{power64} %{aarch64} @@ -1578,6 +1573,9 @@ exit 0 %{_jvmdir}/%{jredir}/lib/accessibility.properties %changelog +* Fri May 30 2014 Omair Majid - 1.7.0.51-2.5.0.22.f21 +- Updated aarch64 tarball + * Fri May 23 2014 Omair Majid - 1.7.0.51-2.5.0.21.f21 - Added aarch64-specfic version of the add-final-location-rpaths path diff --git a/sources b/sources index 341c272..ddba0be 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ ea344cc5b53b73f375558ba41760ff64 class-rewriter.tar.gz +7f72e72d85f3ab5e3f36719a17e132ec openjdk-icedtea-2.5pre04.tar.xz 1cb61996cf5dbe80827abbe7d009bf28 pulseaudio.tar.gz 013ddff65e090aafe9ff89d4ce767e8d systemtap-tapset-2014-03-19.tar.xz -7f72e72d85f3ab5e3f36719a17e132ec openjdk-icedtea-2.5pre04.tar.xz -15c5288e350b49550b23d25f95713626 aarch64-port-jdk7u60-b04-aarch64-831.tar.xz +5fa84f6769117e1f582c779d888af468 aarch64-port-jdk7u60-b04-aarch64-832.tar.xz