From 338251bfa4c1f024b090779aec084fda7139464c Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Fri, 28 Apr 2023 01:41:55 +0100 Subject: [PATCH] Adjust oj_vendor_bug_url to match the portable so test passes Related: rhbz#2150201 --- java-11-openjdk.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index fb34819..4ede654 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -354,7 +354,7 @@ %global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{name}&version=%{fedora} %else %if 0%{?rhel} -%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20Linux%20%{rhel}&component=%{name} +%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20Linux%20%{portablerhel}&component=%{name} %else %global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi %endif @@ -376,7 +376,8 @@ %global rpmrelease 3 # Settings used by the portable build %global portablerelease 2 -%global portablesuffix el8 +%global portablerhel 8 +%global portablesuffix el%{portablerhel} %global portablebuilddir /builddir/build/BUILD #%%global tagsuffix %%{nil} @@ -2468,6 +2469,10 @@ require "copy_jdk_configs.lua" %endif %changelog +* Fri Apr 28 2023 Andrew Hughes - 1:11.0.19.0.7-3 +- Adjust oj_vendor_bug_url to match the portable so test passes +- Related: rhbz#2150201 + * Wed Apr 26 2023 Andrew Hughes - 1:11.0.19.0.7-3 - Revert "Restore native build for x86 as there is no portable build" - Reintroduce useful cleanups from x86 reversion