From 75c2db9e804d26ee478435a2ca5460730be2c744 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Thu, 11 Sep 2014 10:23:23 +0200 Subject: [PATCH] Update aarch64 hotspot to latest upstream version --- .gitignore | 2 ++ java-1.8.0-openjdk.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e1af081..f03e270 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,5 @@ /jdk8u-jdk8u40-b02.tar.xz /jdk8u-jdk8u20-b26.tar.xz /aarch64-hotspot-jdk8u40-b02.tar.xz +/aarch64-hotspot-jdk8u40-b02-c6375c27cbfa.tar.xz +/aarch64-hotspot-jdk8u40-b04-a6df78e590bb.tar.xz diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 298295b..5984aa6 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -94,7 +94,8 @@ %global updatever 40 %global buildver b02 %global aarch64_updatever 40 -%global aarch64_buildver b02 +%global aarch64_buildver b04 +%global aarch64_changesetid a6df78e590bb # priority must be 6 digits in total %global priority 18000%{updatever} %global javaver 1.8.0 @@ -132,7 +133,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever} -Release: 6.%{buildver}%{?dist} +Release: 7.%{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 @@ -153,7 +154,7 @@ URL: http://openjdk.java.net/ # ./generate_source_tarball.sh jdk8u jdk8u jdk8u%{updatever}-%{buildver} # ./generate_source_tarball.sh aarch64-port jdk8 %{aarch64_hg_tag} Source0: jdk8u-jdk8u%{updatever}-%{buildver}.tar.xz -Source1: aarch64-hotspot-jdk8u%{aarch64_updatever}-%{aarch64_buildver}.tar.xz +Source1: aarch64-hotspot-jdk8u%{aarch64_updatever}-%{aarch64_buildver}-%{aarch64_changesetid}.tar.xz # Custom README for -src subpackage Source2: README.src @@ -548,7 +549,7 @@ bash ../../configure \ --with-update-version=%{updatever} \ --with-build-number=%{buildver} \ %ifarch %{aarch64} - --with-user-release-suffix="aarch64-%{aarch64_updatever}-%{aarch64_buildver}" \ + --with-user-release-suffix="aarch64-%{aarch64_updatever}-%{aarch64_buildver}-%{aarch64_changesetid}" \ %endif --with-boot-jdk=/usr/lib/jvm/java-openjdk \ --with-debug-level=%{debugbuild} \ @@ -1334,6 +1335,9 @@ exit 0 %{_jvmdir}/%{jredir}/lib/accessibility.properties %changelog +* Wed Sep 10 2014 Omair Majid - 1:1.8.0.20-7.b26 +- Update aarch64 hotspot to latest upstream version + * Fri Sep 05 2014 Omair Majid - 1:1.8.0.40-6.b26 - Use %%{power64} instead of %%{ppc64}. diff --git a/sources b/sources index 36415f0..fe8a12d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 78d96904ad6d9a7cee76849b0e49b6f0 jdk8u-jdk8u40-b02.tar.xz 94ca5a45c3cb3b85c4577d0891166007 systemtap-tapset.tar.gz -7dcced61a647aec777d6567d6d7070da aarch64-hotspot-jdk8u40-b02.tar.xz +8a9d561065f55762cafd9f475b26cf68 aarch64-hotspot-jdk8u40-b04-a6df78e590bb.tar.xz