From 4a3d1a5d8a5d0ed4e3e1a2061a6e234a859f53f4 Mon Sep 17 00:00:00 2001 From: pmikova Date: Thu, 18 Apr 2019 13:58:43 +0200 Subject: [PATCH] Updated sources to the latest CPU --- .gitignore | 1 + java-latest-openjdk.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index abae79e..42cc560 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /jdk-jdk12-jdk-12+33.tar.xz /systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz +/jdk-updates-jdk12u-jdk-12.0.1+12.tar.xz diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec index a808773..5f4bb48 100644 --- a/java-latest-openjdk.spec +++ b/java-latest-openjdk.spec @@ -205,7 +205,7 @@ # New Version-String scheme-style defines %global majorver 12 -%global securityver 0 +%global securityver 1 # buildjdkver is usually same as %%{majorver}, # but in time of bootstrap of next jdk, it is majorver-1, # and this it is better to change it here, on single place @@ -223,7 +223,7 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global minorver 0 -%global buildver 33 +%global buildver 12 # priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when moving to 11 we had to add another digit %if %is_system_jdk %global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} ) @@ -950,7 +950,7 @@ Version: %{newjavaver}.%{buildver} # This package needs `.rolling` as part of Release so as to not conflict on install with # java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as # java-X-openjdk. See: https://bugzilla.redhat.com/show_bug.cgi?id=1647298 -Release: 3.rolling%{?dist} +Release: 1.rolling%{?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 @@ -985,7 +985,7 @@ URL: http://openjdk.java.net/ # to regenerate source0 (jdk) and source8 (jdk's taspets) run update_package.sh # update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives -Source0: jdk-jdk%{majorver}-jdk-%{majorver}+%{buildver}.tar.xz +Source0: jdk-updates-jdk%{majorver}u-jdk-%{majorver}.%{minorver}.%{securityver}+%{buildver}.tar.xz Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz # Desktop files. Adapted from IcedTea @@ -1611,7 +1611,7 @@ popd # Install Javadoc documentation install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir} cp -a %{buildoutputdir $suffix}/images/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir $suffix} -cp -a %{buildoutputdir $suffix}/bundles/jdk-%{majorver}+%{buildver}%{lts_designator_zip}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir $suffix}.zip +cp -a %{buildoutputdir $suffix}/bundles/jdk-%{majorver}.%{minorver}.%{securityver}+%{buildver}%{lts_designator_zip}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir $suffix}.zip # Install icons and menu entries for s in 16 24 32 48 ; do @@ -1827,6 +1827,9 @@ require "copy_jdk_configs.lua" %changelog +* Thu Apr 18 2019 Petra Mikova - 1:12.0.1.12-1.rolling +- updated sources to current CPU release + * Fri Apr 19 2019 Petra Mikova - 1:12.0.0.33-3.rolling - added missing slave for jfr - removed duplicated dependency on lksctp-tools diff --git a/sources b/sources index dc02974..f10eec3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (jdk-jdk12-jdk-12+33.tar.xz) = e2dea9585fe07ae87fb313d090e9850a547e2ba84a7447d42acd0a04874599ef240f7b6ccaa69955cab5d12f646711cb4467e1b24e090af476e9ff708cc168fe +SHA512 (jdk-updates-jdk12u-jdk-12.0.1+12.tar.xz) = 356164791873b9ddbbac0eb6281ab4e542b97556f4f5a8748edc93ececf1fcb661aaa9955080b693bfc697dc75be8297acb080c4e1a2e579ca8a8741d0ab1881 SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d