From 37c54df631f66f8cacc8cb9fef923f7ab36f8999 Mon Sep 17 00:00:00 2001 From: Alexey Lyubimov Date: Thu, 15 Jun 2023 18:35:58 +0300 Subject: [PATCH] Configuring portablesuffix macro value as el%{msvsphere}, added .inferit dist postfix --- SPECS/java-17-openjdk.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/SPECS/java-17-openjdk.spec b/SPECS/java-17-openjdk.spec index b092579..036acbe 100644 --- a/SPECS/java-17-openjdk.spec +++ b/SPECS/java-17-openjdk.spec @@ -364,7 +364,7 @@ %global rpmrelease 3 # Settings used by the portable build %global portablerelease 2 -%global portablesuffix el8 +%global portablesuffix el%{msvsphere} %global portablebuilddir /builddir/build/BUILD # 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 @@ -1242,7 +1242,7 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist} +Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}.inferit # 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 @@ -2479,6 +2479,9 @@ cjc.mainProgram(args) %endif %changelog +* Thu Jun 15 2023 Alexey Lyubimov - 17.0.7.0.7-3.1 +- Change portablesuffix + * Wed Apr 26 2023 Andrew Hughes - 1:17.0.7.0.7-3 - Sync portable spec file with current version - Related: rhbz#2189326