From 3f0b4091f5dd2a32df54ff65ec212ad1f4fa0d2c Mon Sep 17 00:00:00 2001 From: Jiri Date: Thu, 20 Apr 2017 20:54:05 +0200 Subject: [PATCH] Uploaded new sources from latest tags --- .gitignore | 2 ++ java-1.8.0-openjdk.spec | 14 ++++++++++---- sources | 4 ++-- update_package.sh | 4 ++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index d8c2025..04c6a7a 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,5 @@ /aarch64-port-jdk8u-aarch64-jdk8u121-b14.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u121-b14-shenandoah-merge-2017-02-20.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u121-b14-shenandoah-merge-2017-03-09.tar.xz +/aarch64-port-jdk8u-aarch64-jdk8u131-b12.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u131-b12-shenandoah-merge-2017-04-20.tar.xz diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 1e2ac4b..28a66f1 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -170,7 +170,7 @@ # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there. %global project aarch64-port %global repo jdk8u -%global revision aarch64-jdk8u121-b14 +%global revision aarch64-jdk8u131-b12 # eg # jdk8u60-b27 -> jdk8u60 or # aarch64-jdk8u60-b27 -> aarch64-jdk8u60 (dont forget spec escape % by %%) %global whole_update %(VERSION=%{revision}; echo ${VERSION%%-*}) # eg jdk8u60 -> 60 or aarch64-jdk8u60 -> 60 @@ -779,7 +779,7 @@ Obsoletes: java-1.7.0-openjdk-accessibility%1 Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever} -Release: 12.%{buildver}%{?dist} +Release: 1.%{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 @@ -836,7 +836,7 @@ Source100: config.guess Source101: config.sub # Shenandoah HotSpot -Source999: aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u121-b14-shenandoah-merge-2017-03-09.tar.xz +Source999: aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u131-b12-shenandoah-merge-2017-04-20.tar.xz # RPM/distribution specific patches @@ -1916,7 +1916,13 @@ require "copy_jdk_configs.lua" %endif %changelog -* Wed Mar 19 2017 jvanek - 1:1.8.0.121-12.b14 +* Thu Apr 20 2017 Jiri Vanek - 1:1.8.0.131-1.b12 +- updated to aarch64-jdk8u131-b12 (from aarch64-port/jdk8u) +- updated to aarch64-shenandoah-jdk8u131-b12-shenandoah-merge-2017-04-20 (from aarch64-port/jdk8u-shenandoah) of hotspot +- used aarch64-port-jdk8u-aarch64-jdk8u131-b12.tar.xz as new sources +- used aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u131-b12-shenandoah-merge-2017-04-20.tar.xz as new sources for hotspot + +* Sun Mar 19 2017 jvanek - 1:1.8.0.121-12.b14 - minor tweaks, egrep replaced by grep -E, added provides for some subpackages * Mon Mar 13 2017 jvanek - 1:1.8.0.121-11.b14 diff --git a/sources b/sources index 83169bd..73e6ff2 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (systemtap-tapset-3.1.0.tar.xz) = e3558dc9d56dff5125a869807135e84ca73a2640d8d8fff2f45dc0dd7d153b81b48c08480e09a75667eba62362f74091465fac622aa0d9b104bfb18b4eba80e1 -SHA512 (aarch64-port-jdk8u-aarch64-jdk8u121-b14.tar.xz) = 9c97b5a79c5af698e3d12d69c89ae761b2ef5db6f6ea4ac94504f4ab492eb0b233b874e0a829fb7dbbe44064b49b269a6b4fffed826ada9466df77d196d16994 -SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u121-b14-shenandoah-merge-2017-03-09.tar.xz) = 0e544ffee3d9968c8e77e1a48a136e5de7defa5fe6be0ab60082f9674a050690a1a70b9c2b0c05b3e70787c4e06f30dce45935c000245ba20ec5f97d9fb1563c +SHA512 (aarch64-port-jdk8u-aarch64-jdk8u131-b12.tar.xz) = b7285cbadc787594664944ece1fab74aafd4f3437d75e494b900cdd5ce1d102c0cfa9d734b40c7f122ba8539f098e6dde19894ab15605f4a475138bf69143edf +SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u131-b12-shenandoah-merge-2017-04-20.tar.xz) = 9450dca9445b5ed90de90905a1210388fc825caada0d4929ac9f2c81b3af066dfcbcb80a667cb4c1c644d3ac65678d6bc162f1f11c1cd44f9dbf682ca3ff95cd diff --git a/update_package.sh b/update_package.sh index 71803c7..b66e4d3 100755 --- a/update_package.sh +++ b/update_package.sh @@ -31,7 +31,7 @@ if [ "x$REPO_NAME" = "x" ] ; then REPO_NAME="jdk8u" fi if [ "x$VERSION" = "x" ] ; then - VERSION="aarch64-jdk8u121-b14" + VERSION="aarch64-jdk8u131-b12" fi if [ "x$COMPRESSION" = "x" ] ; then @@ -109,7 +109,7 @@ if [ "x$VERSION" = "xtip" ] ; then VERSION="tip" else #hardcoding version for anything else except tip - VERSION="aarch64-shenandoah-jdk8u121-b14-shenandoah-merge-2017-03-09" + VERSION="aarch64-shenandoah-jdk8u131-b12-shenandoah-merge-2017-04-20" fi MAIN_REPO_NAME=$REPO_NAME REPO_NAME=jdk8u-shenandoah