diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec index 14826534780f1be0d54170e06b1b8a8bfc5e42b9..82a740d56c9c0a6b22187167c892add42e03c0d3 100644 --- a/java-latest-openjdk.spec +++ b/java-latest-openjdk.spec @@ -147,38 +147,49 @@ %endif # New Version-String scheme-style defines -# If you bump majorver, you must bump also vendor_version_string -%global majorver 15 +%global featurever 15 +%global interimver 0 +%global updatever 2 +%global patchver 0 +# If you bump featurever, you must bump also vendor_version_string # Used via new version scheme. JDK 15 was # GA'ed in September 2020 => 20.9 %global vendor_version_string 20.9 -%global securityver 1 -# buildjdkver is usually same as %%{majorver}, -# but in time of bootstrap of next jdk, it is majorver-1, +# buildjdkver is usually same as %%{featurever}, +# but in time of bootstrap of next jdk, it is featurever-1, # and this it is better to change it here, on single place -%global buildjdkver 15 +%global buildjdkver %{featurever} # We don't add any LTS designator for STS packages (this package). # Neither for Fedora nor EPEL which would have %%{rhel} macro defined. %global lts_designator "" %global lts_designator_zip "" +# Define IcedTea version used for SystemTap tapsets and desktop file +%global icedteaver 3.15.0 + # Standard JPackage naming and versioning defines %global origin openjdk %global origin_nice OpenJDK %global top_level_dir_name %{origin} -%global minorver 0 -%global buildver 9 -%global rpmrelease 0 +%global buildver 7 +%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} ) +%global priority %( printf '%02d%02d%02d%02d' %{featurever} %{interimver} %{updatever} %{buildver} ) %else # for techpreview, using 1, so slowdebugs can have 0 %global priority %( printf '%08d' 1 ) %endif -%global newjavaver %{majorver}.%{minorver}.%{securityver} +%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver} -%global javaver %{majorver} +# Omit trailing 0 in filenames when the patch version is 0 +%if 0%{?patchver} > 0 +%global filever %{newjavaver} +%else +%global filever %{featurever}.%{interimver}.%{updatever} +%endif + +%global javaver %{featurever} # Define milestone (EA for pre-releases, GA for releases) # Release will be (where N is usually a number starting at 1): @@ -201,7 +212,7 @@ %global bug_url https://gitee.com/src-openeuler/openjdk-latest/issues # parametrized macros are order-sensitive -%global compatiblename java-%{majorver}-%{origin} +%global compatiblename java-%{featruever}-%{origin} %global fullversion %{compatiblename}-%{version}-%{release} # images stub %global jdkimage jdk @@ -900,7 +911,7 @@ Release: %{?eaprefix}%{rpmrelease}%{?extraver}.rolling # provides >= 1.6.0 must specify the epoch, "java >= 1:1.6.0". Epoch: 1 -Summary: %{origin_nice} Runtime Environment %{majorver} +Summary: %{origin_nice} Runtime Environment %{featurever} # HotSpot code is licensed under GPLv2 # JDK library code is licensed under GPLv2 with the Classpath exception @@ -922,7 +933,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-updates-jdk%{majorver}u-jdk-%{majorver}.%{minorver}.%{securityver}+%{buildver}.tar.xz +Source0: jdk-updates-jdk%{featurever}u-jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}.tar.xz Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz # Desktop files. Adapted from IcedTea @@ -1019,7 +1030,7 @@ The %{origin_nice} runtime environment. %if %{include_debug_build} %package slowdebug -Summary: %{origin_nice} Runtime Environment %{majorver} %{debug_on} +Summary: %{origin_nice} Runtime Environment %{featurever} %{debug_on} %{java_rpo -- %{debug_suffix_unquoted}} %description slowdebug @@ -1029,12 +1040,12 @@ The %{origin_nice} runtime environment. %if %{include_normal_build} %package headless -Summary: %{origin_nice} Headless Runtime Environment %{majorver} +Summary: %{origin_nice} Headless Runtime Environment %{featurever} %{java_headless_rpo %{nil}} %description headless -The %{origin_nice} runtime environment %{majorver} without audio and video support. +The %{origin_nice} runtime environment %{featurever} without audio and video support. %endif %if %{include_debug_build} @@ -1044,34 +1055,34 @@ Summary: %{origin_nice} Runtime Environment %{debug_on} %{java_headless_rpo -- %{debug_suffix_unquoted}} %description headless-slowdebug -The %{origin_nice} runtime environment %{majorver} without audio and video support. +The %{origin_nice} runtime environment %{featurever} without audio and video support. %{debug_warning} %endif %if %{include_normal_build} %package devel -Summary: %{origin_nice} Development Environment %{majorver} +Summary: %{origin_nice} Development Environment %{featurever} %{java_devel_rpo %{nil}} %description devel -The %{origin_nice} development tools %{majorver}. +The %{origin_nice} development tools %{featurever}. %endif %if %{include_debug_build} %package devel-slowdebug -Summary: %{origin_nice} Development Environment %{majorver} %{debug_on} +Summary: %{origin_nice} Development Environment %{featurever} %{debug_on} %{java_devel_rpo -- %{debug_suffix_unquoted}} %description devel-slowdebug -The %{origin_nice} development tools %{majorver}. +The %{origin_nice} development tools %{featurever}. %{debug_warning} %endif %if %{include_normal_build} %package jmods -Summary: JMods for %{origin_nice} %{majorver} +Summary: JMods for %{origin_nice} %{featurever} %{java_jmods_rpo %{nil}} @@ -1081,80 +1092,80 @@ The JMods for %{origin_nice}. %if %{include_debug_build} %package jmods-slowdebug -Summary: JMods for %{origin_nice} %{majorver} %{debug_on} +Summary: JMods for %{origin_nice} %{featurever} %{debug_on} %{java_jmods_rpo -- %{debug_suffix_unquoted}} %description jmods-slowdebug -The JMods for %{origin_nice} %{majorver}. +The JMods for %{origin_nice} %{featurever}. %{debug_warning} %endif %if %{include_normal_build} %package demo -Summary: %{origin_nice} Demos %{majorver} +Summary: %{origin_nice} Demos %{featurever} %{java_demo_rpo %{nil}} %description demo -The %{origin_nice} demos %{majorver}. +The %{origin_nice} demos %{featurever}. %endif %if %{include_debug_build} %package demo-slowdebug -Summary: %{origin_nice} Demos %{majorver} %{debug_on} +Summary: %{origin_nice} Demos %{featurever} %{debug_on} %{java_demo_rpo -- %{debug_suffix_unquoted}} %description demo-slowdebug -The %{origin_nice} demos %{majorver}. +The %{origin_nice} demos %{featurever}. %{debug_warning} %endif %if %{include_normal_build} %package src -Summary: %{origin_nice} Source Bundle %{majorver} +Summary: %{origin_nice} Source Bundle %{featurever} %{java_src_rpo %{nil}} %description src -The java-%{origin}-src sub-package contains the complete %{origin_nice} %{majorver} +The java-%{origin}-src sub-package contains the complete %{origin_nice} %{featurever} class library source code for use by IDE indexers and debuggers. %endif %if %{include_debug_build} %package src-slowdebug -Summary: %{origin_nice} Source Bundle %{majorver} %{for_debug} +Summary: %{origin_nice} Source Bundle %{featurever} %{for_debug} %{java_src_rpo -- %{debug_suffix_unquoted}} %description src-slowdebug -The java-%{origin}-src-slowdebug sub-package contains the complete %{origin_nice} %{majorver} +The java-%{origin}-src-slowdebug sub-package contains the complete %{origin_nice} %{featurever} class library source code for use by IDE indexers and debuggers. Debugging %{for_debug}. %endif %if %{include_normal_build} %package javadoc -Summary: %{origin_nice} %{majorver} API documentation +Summary: %{origin_nice} %{featurever} API documentation Requires: javapackages-filesystem Obsoletes: javadoc-slowdebug < 1:13.0.0.33-1.rolling %{java_javadoc_rpo %{nil}} %description javadoc -The %{origin_nice} %{majorver} API documentation. +The %{origin_nice} %{featurever} API documentation. %endif %if %{include_normal_build} %package javadoc-zip -Summary: %{origin_nice} %{majorver} API documentation compressed in a single archive +Summary: %{origin_nice} %{featurever} API documentation compressed in a single archive Requires: javapackages-filesystem Obsoletes: javadoc-zip-slowdebug < 1:13.0.0.33-1.rolling %{java_javadoc_rpo %{nil}} %description javadoc-zip -The %{origin_nice} %{majorver} API documentation compressed in a single archive. +The %{origin_nice} %{featurever} API documentation compressed in a single archive. %endif %prep @@ -1231,7 +1242,7 @@ for file in %{SOURCE9}; do sed -e "s:@JAVA_HOME@:%{sdkbindir -- $suffix}:g" $file > $OUTPUT_FILE sed -i -e "s:@JRE_HOME@:%{jrebindir -- $suffix}:g" $OUTPUT_FILE sed -i -e "s:@ARCH@:%{version}-%{release}.%{_arch}$suffix:g" $OUTPUT_FILE - sed -i -e "s:@JAVA_MAJOR_VERSION@:%{majorver}:g" $OUTPUT_FILE + sed -i -e "s:@JAVA_MAJOR_VERSION@:%{featurever}:g" $OUTPUT_FILE sed -i -e "s:@JAVA_VENDOR@:%{origin}:g" $OUTPUT_FILE done done @@ -1508,7 +1519,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}.%{minorver}.%{securityver}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip + cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{featurever}.%{interimver}.%{updatever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip fi # Install icons and menu entries @@ -1717,6 +1728,9 @@ require "copy_jdk_configs.lua" %changelog +* Tue Feb 23 2021 jdkboy - 1:15.0.1.9-0.rolling +- Update to jdk-15.0.2+7 + * Tue Oct 27 2020 noah - 1:15.0.1.9-0.rolling - Update to jdk-15.0.1+9 diff --git a/jdk-updates-jdk15u-jdk-15.0.1+9.tar.xz b/jdk-updates-jdk15u-jdk-15.0.2+7.tar.xz similarity index 72% rename from jdk-updates-jdk15u-jdk-15.0.1+9.tar.xz rename to jdk-updates-jdk15u-jdk-15.0.2+7.tar.xz index 5c6811389d1211b47a0b223f0ce3ee4fb081258a..74cece5ef2ff06931eeacde582ae6fb364994798 100644 Binary files a/jdk-updates-jdk15u-jdk-15.0.1+9.tar.xz and b/jdk-updates-jdk15u-jdk-15.0.2+7.tar.xz differ diff --git a/sources b/sources index c53fb1b8e411d31012c1a6bcb482943f11ab1faf..fecd76b704ac010699f17595577d5017d61dc9f0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (jdk-updates-jdk14u-jdk-14.0.2+12.tar.xz) = cbd05728395d09b4d69ecfee6eb737262d199e0bbc8ad047c1912cbb23dd2434753f2a7070a9a71aa6cd8e09ff0badd8a25c9e1ec512936ffd234e530baae357 -SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d +SHA512 (jdk-updates-jdk15u-jdk-15.0.2+7.tar.xz) = a0d1d4b51c974f3d7a98276426ac9c4669361ef5be5257d1237863b9a931fe1a +SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = ece0a6696319d6778d4f9b0e6a07fa8b3ad0b6c3dab16e3ee49fbded17fb500f diff --git a/update_package.sh b/update_package.sh index 403c236eefad7738505059d1a0afa0d2de44388a..4a9aaa5cf45d5180e0c73fca99fce9e75ef813f7 100644 --- a/update_package.sh +++ b/update_package.sh @@ -33,8 +33,8 @@ fi # OpenJDK from Shenandoah project export PROJECT_NAME="jdk-updates" -export REPO_NAME="jdk14u" -export VERSION="jdk-14.0.2-ga" +export REPO_NAME="jdk15u" +export VERSION="jdk-15.0.2+7" export COMPRESSION=xz # unset tapsets overrides export OPENJDK_URL=""