From 74b190629306d04d22ca1f98c548282dfa7425d2 Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Thu, 10 Sep 2020 17:54:43 +0200 Subject: [PATCH] Update static-libs packaging to new layout --- java-11-openjdk.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index 97b6a55..1b1928b 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -259,7 +259,7 @@ %global top_level_dir_name %{origin} %global minorver 0 %global buildver 6 -%global rpmrelease 0 +%global rpmrelease 1 #%%global tagsuffix "" # priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when moving to 11 we had to add another digit %if %is_system_jdk @@ -847,7 +847,7 @@ exit 0 } %define files_static_libs() %{expand: -%{_jvmdir}/%{sdkdir -- %{?1}}/lib/lib*.a +%{_jvmdir}/%{sdkdir -- %{?1}}/lib/static/linux-%{archinstall}/glibc/lib*.a } %define files_javadoc() %{expand: @@ -1730,8 +1730,9 @@ pushd %{buildoutputdir $suffix}/images/%{jdkimage} popd # Install static libs artefacts +mkdir -p $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/lib/static/linux-%{archinstall}/glibc cp -a %{buildoutputdir -- $suffix}/images/%{static_libs_image}/lib/*.a \ - $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/lib + $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/lib/static/linux-%{archinstall}/glibc if ! echo $suffix | grep -q "debug" ; then @@ -1962,6 +1963,9 @@ require "copy_jdk_configs.lua" %changelog +* Tue Sep 15 2020 Severin Gehwolf - 1:11.0.9.6-0.1.ea +- Update static-libs packaging to new layout + * Tue Sep 15 2020 Andrew Hughes - 1:11.0.9.6-0.0.ea - Update to jdk-11.0.9+6 (EA) - Update tarball generation script to use PR3802, handling JDK-8233228 & JDK-8177334