From b473268bb00ae264946f7f620ed092dbf659a853 Mon Sep 17 00:00:00 2001 From: Petra Mikova Date: Tue, 22 Oct 2019 20:45:42 +0200 Subject: [PATCH] Updated to October 2019 CPU sources --- .gitignore | 1 + java-latest-openjdk.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index de50c26..58da5be 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /jdk-jdk13-jdk-13+27.tar.xz /jdk-jdk13-jdk-13+28.tar.xz /jdk-jdk13-jdk-13+33.tar.xz +/jdk-updates-jdk13u-jdk-13.0.1+9.tar.xz diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec index 039d8c7..83f3bc1 100644 --- a/java-latest-openjdk.spec +++ b/java-latest-openjdk.spec @@ -200,7 +200,7 @@ # New Version-String scheme-style defines %global majorver 13 -%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 @@ -218,8 +218,8 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global minorver 0 -%global buildver 33 -%global rpmrelease 3 +%global buildver 9 +%global rpmrelease 1 # priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit %if %is_system_jdk %global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} ) @@ -1003,7 +1003,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-jdk13u-jdk-%{majorver}.%{minorver}.%{securityver}+%{buildver}.tar.xz Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz # Desktop files. Adapted from IcedTea @@ -1589,7 +1589,7 @@ if ! echo $suffix | grep -q "debug" ; then # 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}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip + cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{majorver}.%{minorver}.%{securityver}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip fi # Install icons and menu entries @@ -1802,6 +1802,9 @@ require "copy_jdk_configs.lua" %changelog +* Mon Oct 21 2019 Petra Alice Mikova - 1:13.0.1.9-1.rolling +- Updated to October 2019 CPU sources + * Wed Oct 16 2019 Petra Alice Mikova - 1:13.0.0.33-3.rolling - synced up generate tarball script with other OpenJDK packages - dropped pr2126-synchronise_elliptic_curves_in_sun_security_ec_namedcurve_with_those_listed_by_nss.patch from the sources diff --git a/sources b/sources index 72bdd66..c966ab5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (jdk-jdk13-jdk-13+33.tar.xz) = 883bc3a88375b8df5ba5e121ec608a8c6a4a21f0d5df646361b90d10a6efd500e0c48579197b9d692dfc452cfdf01c30d5c71feb4ccdf3dd3b4d71d6e3915e44 +SHA512 (jdk-updates-jdk13u-jdk-13.0.1+9.tar.xz) = 0f3dad5444d8ae3f2d3e239377dc8d0833ef582a69caebb703e8846d7ffe5df5c3fafb384a592b8513ff48c4ca3eac43d266831e371735c61f425173b1ff5fac SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d