diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec index 1663e1e..881800a 100644 --- a/java-latest-openjdk.spec +++ b/java-latest-openjdk.spec @@ -328,7 +328,7 @@ %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup %global buildver 12 -%global rpmrelease 1 +%global rpmrelease 2 # 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 # Using 10 digits may overflow the int used for priority, so we combine the patch and build versions @@ -1702,6 +1702,8 @@ if [ %{include_debug_build} -eq 0 -a %{include_normal_build} -eq 0 -a %{includ echo "You have disabled all builds (normal,fastdebug,slowdebug). That is a no go." exit 14 fi + +%setup -q -c -n %{uniquesuffix ""} -T # https://bugzilla.redhat.com/show_bug.cgi?id=1189084 prioritylength=`expr length %{priority}` if [ $prioritylength -ne 8 ] ; then @@ -1984,7 +1986,7 @@ pushd ${jdk_image} # Install systemtap support files install -dm 755 $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/tapset # note, that uniquesuffix is in BUILD dir in this case - cp -a $RPM_BUILD_DIR/tapset$suffix/*.stp $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/tapset/ + cp -a $RPM_BUILD_DIR/%{uniquesuffix ""}/tapset$suffix/*.stp $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/tapset/ pushd $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/tapset/ tapsetFiles=`ls *.stp` popd @@ -2390,6 +2392,10 @@ cjc.mainProgram(args) %endif %changelog +* Wed Nov 22 2023 Jiri Vanek - 1:21.0.1.0.12-2.rolling +- added setup and thus enabled debuginfo strip +- note, that debugsources are now empty. Symlink from full sourcess to build/jdk21.build or build/vcstag is needed + * Wed Nov 22 2023 Jiri Vanek - 1:21.0.1.0.12-1.rolling - updated to OpenJDK 21.0.1 (2023-10-17)