undefine pkgos and fix portablesuffix to el8

i8
Alexey Lyubimov 1 year ago
parent 96ee75440d
commit 602fc2787a

@ -354,7 +354,7 @@
%global rpmrelease 2 %global rpmrelease 2
# Settings used by the portable build # Settings used by the portable build
%global portablerelease 1 %global portablerelease 1
%global portablesuffix el7_9 %global portablesuffix el8
%global portablebuilddir /builddir/build/BUILD %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 # 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 %global __jar_repack 0
# Define the OS the portable JDK is built on # Define the OS the portable JDK is built on
%global pkgos rhel7 %global pkgos rhel7
%undefine pkgos
# Define the root name of the portable packages # Define the root name of the portable packages
%global pkgnameroot java-%{featurever}-%{origin}-portable%{?pkgos:-%{pkgos}} %global pkgnameroot java-%{featurever}-%{origin}-portable%{?pkgos:-%{pkgos}}

Loading…
Cancel
Save