diff --git a/jdk-updates-jdk17u-jdk-17.0.1+12.tar.gz b/jdk-updates-jdk17u-jdk-17.0.1+12.tar.gz deleted file mode 100644 index 7389e52a3f4f2dcc7f494e3b9db74a9a0c21ab76..0000000000000000000000000000000000000000 Binary files a/jdk-updates-jdk17u-jdk-17.0.1+12.tar.gz and /dev/null differ diff --git a/jdk-updates-jdk17u-jdk-17.0.2+9.tar.gz b/jdk-updates-jdk17u-jdk-17.0.2+9.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..b765814e4bd84807e8f5573d71695b2b40dc579d Binary files /dev/null and b/jdk-updates-jdk17u-jdk-17.0.2+9.tar.gz differ diff --git a/openjdk-latest.spec b/openjdk-latest.spec index c84af29f239ef486d6522527308a44a58949aa4d..1816c9f481db0ed06d3462ad5708cf446f80f977 100644 --- a/openjdk-latest.spec +++ b/openjdk-latest.spec @@ -155,23 +155,28 @@ # Used via new version scheme. JDK 17 was # GA'ed in March 2021 => 21.9 %global vendor_version_string 21.9 -%global securityver 1 +%global securityver 2 # 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 %global buildjdkver 17 -# 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 "" +# 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} + %global lts_designator "LTS" + %global lts_designator_zip -%{lts_designator} +%else + %global lts_designator "" + %global lts_designator_zip "" +%endif # Standard JPackage naming and versioning defines %global origin openjdk %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global minorver 0 -%global buildver 12 -%global rpmrelease 2 +%global buildver 9 +%global rpmrelease 0 # 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} ) @@ -544,7 +549,7 @@ exit 0 %endif %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsctp.so %ifarch %{svml_arches} -%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsvml.so +%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjsvml.so %endif %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsyslookup.so %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libverify.so @@ -777,7 +782,7 @@ Requires: tzdata-java >= 2015d # tool to copy jdk's configs - should be Recommends only, but then only dnf/yum enforce it, # not rpm transaction and so no configs are persisted when pure rpm -u is run. It may be # considered as regression -Requires: copy-jdk-configs >= 3.3 +Requires: copy-jdk-configs >= 3.9 OrderWithRequires: copy-jdk-configs # for printing support Requires: cups-libs @@ -1577,7 +1582,13 @@ done -- whether copy-jdk-configs is installed or not. If so, then configs are copied -- (copy_jdk_configs from %%{_libexecdir} used) or not copied at all local posix = require "posix" -local debug = false + +if (os.getenv("debug") == "true") then + debug = true; + print("cjc: in spec debug is on") +else + debug = false; +end SOURCE1 = "%{rpm_state_dir}/copy_jdk_configs.lua" SOURCE2 = "%{_libexecdir}/copy_jdk_configs.lua" @@ -1606,8 +1617,9 @@ else end end -- run content of included file with fake args +cjc = require "copy_jdk_configs.lua" arg = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"} -require "copy_jdk_configs.lua" +cjc.mainProgram(arg) %post %{post_script %{nil}} @@ -1732,6 +1744,12 @@ require "copy_jdk_configs.lua" %changelog +* Fri Feb 11 2022 kuenking111 - 1:17.0.2.9-0.rolling +- Update to jdk-17.0.2+9-ga + +* Wed Jan 05 2021 noah - 1:17.0.1.12-3-rolling +- adapted to newst cjc to fix issue with rpm 4.17 + * Tue Dec 21 2021 kuenking111 - 1:17.0.1.12-2-rolling - delete stack protection