diff --git a/jdk-updates-jdk18u-jdk-18.0.2+9.tar.gz b/jdk-jdk19-jdk-19+36.tar.gz similarity index 92% rename from jdk-updates-jdk18u-jdk-18.0.2+9.tar.gz rename to jdk-jdk19-jdk-19+36.tar.gz index daf835535e933df190b26d8b7e3d8acc5c57392e..1150be7ccc2984664ddedc717c14a3505ae4d25e 100644 Binary files a/jdk-updates-jdk18u-jdk-18.0.2+9.tar.gz and b/jdk-jdk19-jdk-19+36.tar.gz differ diff --git a/openjdk-latest.spec b/openjdk-latest.spec index dd379c75635df17b7e20a45790b27d4beae67a6b..6f4b2819e04ef2e24a98aa74c53d890b431e3c67 100644 --- a/openjdk-latest.spec +++ b/openjdk-latest.spec @@ -56,7 +56,7 @@ # in alternatives those are slaves and master, very often triplicated by man pages # in files all masters and slaves are ghosted # the ghosts are here to allow installation via query like `dnf install /usr/bin/java` -# you can list those files, with appropriate sections: cat *.spec | grep -e --install -e --slave -e post_ +# you can list those files, with appropriate sections: cat *.spec | grep -e --install -e --slave -e post_ # TODO - fix those hardcoded lists via single list # those files ,must *NOT* be ghosted for *slowdebug* packages # FIXME - if you are moving jshell or jlink or simialr, always modify all three sections @@ -151,15 +151,15 @@ # New Version-String scheme-style defines # If you bump majorver, you must bump also vendor_version_string -%global majorver 18 -# Used via new version scheme. JDK 18 was +%global majorver 19 +# Used via new version scheme. JDK 19 was # GA'ed in March 2022 => 22.3 %global vendor_version_string 22.3 -%global securityver 2 +%global securityver 0 # buildjdkver is usually same as %%{majorver}, -# but in time of bootstrap of next jdk, it is majorver-1, +# but in time of bootstrap of next jdk, it is majorver-1, # and this it is better to change it here, on single place -%global buildjdkver 18 +%global buildjdkver 19 # We don't add any LTS designator for STS packages (Fedora and EPEL). # We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined. %if 0%{?rhel} && !0%{?epel} @@ -175,8 +175,8 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global minorver 0 -%global buildver 9 -%global rpmrelease 0 +%global buildver 36 +%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} ) @@ -298,7 +298,7 @@ alternatives \\ --slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \\ %{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1$ext \\ --slave %{_mandir}/man1/rmiregistry.1$ext rmiregistry.1$ext \\ - %{_mandir}/man1/rmiregistry-%{uniquesuffix -- %{?1}}.1$ext + %{_mandir}/man1/rmiregistry-%{uniquesuffix -- %{?1}}.1$ext for X in %{origin} %{javaver} ; do alternatives --install %{_jvmdir}/jre-"$X" jre_"$X" %{_jvmdir}/%{sdkdir -- %{?1}} $PRIORITY --family %{name}.%{_arch} @@ -419,7 +419,7 @@ alternatives \\ --slave %{_mandir}/man1/jwebserver.1$ext jwebserver.1$ext \\ %{_mandir}/man1/jwebserver-%{uniquesuffix -- %{?1}}.1$ext \\ --slave %{_mandir}/man1/serialver.1$ext serialver.1$ext \\ - %{_mandir}/man1/serialver-%{uniquesuffix -- %{?1}}.1$ext + %{_mandir}/man1/serialver-%{uniquesuffix -- %{?1}}.1$ext for X in %{origin} %{javaver} ; do alternatives \\ @@ -725,7 +725,6 @@ exit 0 %define files_demo() %{expand: %license %{_jvmdir}/%{sdkdir -- %{?1}}/legal %{_jvmdir}/%{sdkdir -- %{?1}}/demo -%{_jvmdir}/%{sdkdir -- %{?1}}/sample } %define files_src() %{expand: @@ -928,7 +927,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-%{filever}+%{buildver}.tar.gz +Source0: jdk-jdk%{majorver}-jdk-%{filever}+%{buildver}.tar.gz Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz # Desktop files. Adapted from IcedTea @@ -1168,6 +1167,8 @@ Obsoletes: javadoc-zip-slowdebug < 1:13.0.0.33-1.rolling The %{origin_nice} %{majorver} API documentation compressed in a single archive. %endif +%global debug_package %{nil} + %prep if [ %{include_normal_build} -eq 0 -o %{include_normal_build} -eq 1 ] ; then echo "include_normal_build is %{include_normal_build}" @@ -1417,9 +1418,9 @@ do IFS=$'\n' for line in $(eu-readelf -s "$lib" | grep "00000000 0 FILE LOCAL DEFAULT") do - # We expect to see .cpp files, except for architectures like aarch64 and + # We expect to see .cpp and .S files, except for architectures like aarch64 and # s390 where we expect .o and .oS files - echo "$line" | grep -E "ABS ((.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx|o|oS))?$" + echo "$line" | grep -E "ABS ((.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx|o|S|oS))?$" done IFS="$old_IFS" @@ -1443,7 +1444,7 @@ done # Make sure gdb can do a backtrace based on line numbers on libjvm.so # javaCalls.cpp:58 should map to: -# http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/ff3b27e6bcc2/src/share/vm/runtime/javaCalls.cpp#l58 +# http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/ff3b27e6bcc2/src/share/vm/runtime/javaCalls.cpp#l58 # Using line number 1 might cause build problems. See: gdb -q "$JAVA_HOME/bin/java" < - 1:19.0.0.36-1.rolling +- set build jdk to 19 + +* Thu Oct 27 2022 DXwangg -1:19.0.0.36-0.0.ea.rolling +- Update to jdk-19.0.0.0+36 +- Remove references to sample directory removed by JDK-8284999 +- Need to include the '.S' suffix in debuginfo checks after JDK-8284661 + * Tue Jul 26 2022 noah - 1:18.0.2.9-0-rolling - Update to jdk-18.0.2+9 @@ -1817,11 +1822,11 @@ cjc.mainProgram(arg) - Bumped buildjdkver to build by itself - 16 * Wed May 12 2021 noah - 1:16.0.0.36-0.0.ea.rolling -- Update to jdk-16.0.0.0+36 -- Use upstream default for version-pre rather than setting it to "ea" or "" -- Drop libsunec.so which is no longer generated, thanks to JDK-8235710 -- Drop unnecessary compiler flags, dating back to work on GCC 6 & 10 -- Use system harfbuzz now this is supported. +- Update to jdk-16.0.0.0+36 +- Use upstream default for version-pre rather than setting it to "ea" or "" +- Drop libsunec.so which is no longer generated, thanks to JDK-8235710 +- Drop unnecessary compiler flags, dating back to work on GCC 6 & 10 +- Use system harfbuzz now this is supported. - Pass SOURCE_DATE_EPOCH to build for reproducible builds * Mon Mar 1 2021 noah - 1:15.0.2.7-0.rolling