From 2d03e5b4008119f4195b3533d56388854d819a80 Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Tue, 10 Jul 2018 11:24:24 +0200 Subject: [PATCH] Fix hook to show hs_err*.log files on failures. --- java-1.8.0-openjdk.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 990507f..3e40f6b 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -955,7 +955,7 @@ Provides: java-%{javaver}-%{origin}-accessibility = %{epoch}:%{version}-%{releas Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever} -Release: 13.%{buildver}%{?dist} +Release: 14.%{buildver}%{?dist} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -1713,6 +1713,9 @@ else debugbuild=`echo $suffix | sed "s/-//g"` fi +# Variable used in hs_err hook on build failures +top_dir_abs_path=$(pwd)/%{top_level_dir_name} + mkdir -p %{buildoutputdir -- $suffix} pushd %{buildoutputdir -- $suffix} @@ -1761,7 +1764,7 @@ make \ POST_STRIP_CMD="" \ LOG=trace \ SCTP_WERROR= \ - %{targets} || ( find -name "hs_err_pid*.log" | xargs cat && false ) + %{targets} || ( pwd; find $top_dir_abs_path -name "hs_err_pid*.log" | xargs cat && false ) make zip-docs @@ -2266,6 +2269,9 @@ require "copy_jdk_configs.lua" %endif %changelog +* Tue Jul 10 2018 Severin Gehwolf - 1:1.8.0.172-14.b11 +- Fix hook to show hs_err*.log files on failures. + * Mon Jul 02 2018 Severin Gehwolf - 1:1.8.0.172-13.b11 - Fix requires/provides filters for internal libs. See RHBZ#1590796