diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec index f187925..1c7908b 100644 --- a/java-latest-openjdk.spec +++ b/java-latest-openjdk.spec @@ -279,9 +279,9 @@ %endif # New Version-String scheme-style defines -%global featurever 21 +%global featurever 22 %global interimver 0 -%global updatever 2 +%global updatever 0 %global patchver 0 # We don't add any LTS designator for STS packages (Fedora and EPEL). @@ -330,7 +330,7 @@ %global origin_nice OpenJDK %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 13 +%global buildver 32 %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 @@ -856,7 +856,7 @@ exit 0 %endif %endif %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsctp.so -%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsystemconf.so +%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsimdsort.so %ifarch %{svml_arches} %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjsvml.so %endif @@ -903,7 +903,6 @@ exit 0 %config(noreplace) %{etcjavadir -- %{?1}}/conf/security/java.policy %config(noreplace) %{etcjavadir -- %{?1}}/conf/security/java.security %config(noreplace) %{etcjavadir -- %{?1}}/conf/logging.properties -%config(noreplace) %{etcjavadir -- %{?1}}/conf/security/nss.fips.cfg %config(noreplace) %{etcjavadir -- %{?1}}/conf/management/jmxremote.access # This is a config template, thus not config-noreplace %config %{etcjavadir -- %{?1}}/conf/management/jmxremote.password.template @@ -1060,6 +1059,7 @@ exit 0 %dir %{_jvmdir}/%{sdkdir -- %{?1}}/%{static_libs_arch_dir} %dir %{_jvmdir}/%{sdkdir -- %{?1}}/%{static_libs_install_dir} %{_jvmdir}/%{sdkdir -- %{?1}}/%{static_libs_install_dir}/lib*.a +%{_jvmdir}/%{sdkdir -- %{?1}}/%{static_libs_install_dir}/server/lib*.a } %define files_javadoc() %{expand: @@ -2127,7 +2127,7 @@ $JAVA_HOME/bin/java $(echo $(basename %{SOURCE14})|sed "s|\.java||") $JAVA_HOME/bin/javac -d . %{SOURCE15} export PROG=$(echo $(basename %{SOURCE15})|sed "s|\.java||") export SEC_DEBUG="-Djava.security.debug=properties" -$JAVA_HOME/bin/java ${SEC_DEBUG} ${PROG} true +$JAVA_HOME/bin/java ${SEC_DEBUG} ${PROG} true || echo "FIXME! Fips are now disabled in portables" $JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=true ${PROG} false # Check java launcher has no SSB mitigation @@ -2419,6 +2419,14 @@ cjc.mainProgram(args) %endif %changelog +* Mon Jan 29 2024 Jiri Vanek - 1:22.0.0.0.32-1 +- Update to jdk-22.0.0.0.32-0.2 +- removed libsystemconf.so; not present in jdk? +- removed nss.fips.cfg; fisp disabled in portables for now +- disabled java ${SEC_DEBUG} ${PROG} true; fisp disabled in portables for now +- added lib/libsimdsort.so +- added server/libjvm.a + * Sat Jan 20 2024 Jiri Vanek - 1:21.0.2.0.13-1 - Update to jdk-21.0.2+13 (GA)