diff --git a/java-25-openjdk.spec b/java-25-openjdk.spec index e9a1665..88faab3 100644 --- a/java-25-openjdk.spec +++ b/java-25-openjdk.spec @@ -204,27 +204,6 @@ %endif %endif -%if %{include_staticlibs} -# Extra target for producing the static-libraries. Separate from -# other targets since this target is configured to use in-tree -# AWT dependencies: lcms, libjpeg, libpng, libharfbuzz, giflib -# and possibly others -%global static_libs_target static-libs-image -%else -%global static_libs_target %{nil} -%endif - -# RPM JDK builds keep the debug symbols internal, to be later stripped by RPM -%global debug_symbols internal - -# unlike portables,the rpms have to use static_libs_target very dynamically -%global bootstrap_targets images -%global release_targets images docs-zip -# No docs nor bootcycle for debug builds -%global debug_targets images -# Target to use to just build HotSpot -%global hotspot_target hotspot - # debugedit tool for rewriting ELF file paths %if 0%{?rhel} >= 10 # From RHEL 10, the tool is in its own package installed in the usual location @@ -431,9 +410,6 @@ # parametrized macros are order-sensitive %global compatiblename java-%{featurever}-%{origin} %global fullversion %{compatiblename}-%{version}-%{release} -# images directories from upstream build -%global jdkimage jdk -%global static_libs_image static-libs # output dir stub %define installoutputdir() %{expand:install/jdk%{featurever}.install%{?1}} # we can copy the javadoc to not arched dir, or make it not noarch @@ -1084,7 +1060,6 @@ fi %dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib/static/linux-%{archinstall} %dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib/static/linux-%{archinstall}/glibc %{_jvmdir}/%{sdkdir -- %{?1}}/lib/static/linux-%{archinstall}/glibc/lib*.a -%{_jvmdir}/%{sdkdir -- %{?1}}/lib/static/linux-%{archinstall}/glibc/%{vm_variant}/lib*.a } %define files_javadoc() %{expand: @@ -2650,7 +2625,10 @@ exit 0 %changelog * Tue Dec 02 2025 Andrew Hughes - 1:25.0.1.0.8-5 - Incorporate new FIPS patch for 25u +- Drop static libjvm.a following adjusted build target for portable build +- Remove redundant (and now outdated) build targets, jdkimage and static_libs_image - Resolves: RHEL-133733 +- Resolves: RHEL-133735 * Wed Nov 26 2025 Thomas Fitzsimmons - 1:25.0.1.0.8-4 - Add java-25-openjdk-crypto-adapter subpackage