From 7ddb2ab59622c6e414dc7406c0b2af2d6c9087a2 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Thu, 17 Jul 2014 16:20:55 +0200 Subject: [PATCH] Attempt to update aarch64 *jdk* to u11b12, by resticting aarch64 sources to hotpot only --- .gitignore | 1 + java-1.8.0-openjdk.spec | 17 ++++++++++------- sources | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index ebfcb6f..606b199 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /aarch64-port-jdk8-b128-aarch64-992.tar.xz /jdk8u-jdk8u5-b13.tar.xz /jdk8u-jdk8u11-b12.tar.xz +/aarch64-hotspot-jdk8-b128-aarch64-992.tar.xz diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index ef04f1e..0535e3e 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -135,7 +135,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever} -Release: 4.%{buildver}%{?dist} +Release: 5.%{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 @@ -156,7 +156,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-port-jdk8-%{aarch64_buildver}-aarch64-%{aarch64_hg_tag}.tar.xz +Source1: aarch64-hotspot-jdk8-%{aarch64_buildver}-aarch64-%{aarch64_hg_tag}.tar.xz # Custom README for -src subpackage Source2: README.src @@ -432,13 +432,13 @@ need to. %prep +%setup -q -c -n %{name} -T -a 0 %ifarch %{aarch64} -%global source_num 1 -%else -%global source_num 0 +pushd jdk8 +rm -r hotspot +tar xf %{SOURCE1} +popd %endif - -%setup -q -c -n %{name} -T -a %{source_num} cp %{SOURCE2} . # replace outdated configure guess script @@ -1156,6 +1156,9 @@ exit 0 %{_jvmdir}/%{jredir}/lib/accessibility.properties %changelog +* Tue Jul 15 2014 Jiri Vanek - 1:1.8.0.11-5.b12 +- Attempt to update aarch64 *jdk* to u11b12, by resticting aarch64 sources to hotpot only + * Tue Jul 15 2014 Jiri Vanek - 1:1.8.0.11-1.b12 - updated to security u11b12 diff --git a/sources b/sources index 70accbc..9a44096 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 84eed2615ebcf518ad92c88c280ede9e jdk8u-jdk8u11-b12.tar.xz 94ca5a45c3cb3b85c4577d0891166007 systemtap-tapset.tar.gz -944bc1bc5b3a23ab7748bcf3230f5afc aarch64-port-jdk8-b128-aarch64-992.tar.xz +8c0436da8098f15c7bda2fa4f927e525 aarch64-hotspot-jdk8-b128-aarch64-992.tar.xz