From 602fc2787a2c8f8105d2e574b1e253b53945d97c Mon Sep 17 00:00:00 2001 From: Alexey Lyubimov Date: Mon, 25 Dec 2023 18:55:49 +0300 Subject: [PATCH] undefine pkgos and fix portablesuffix to el8 --- SPECS/java-21-openjdk.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SPECS/java-21-openjdk.spec b/SPECS/java-21-openjdk.spec index 11c886e..8e0b976 100644 --- a/SPECS/java-21-openjdk.spec +++ b/SPECS/java-21-openjdk.spec @@ -354,7 +354,7 @@ %global rpmrelease 2 # Settings used by the portable build %global portablerelease 1 -%global portablesuffix el7_9 +%global portablesuffix el8 %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 @@ -1264,6 +1264,7 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release} %global __jar_repack 0 # Define the OS the portable JDK is built on %global pkgos rhel7 +%undefine pkgos # Define the root name of the portable packages %global pkgnameroot java-%{featurever}-%{origin}-portable%{?pkgos:-%{pkgos}}