- Remove pkgos
- Use el9 portable build
This commit is contained in:
parent
726bc53b0f
commit
a12191bbdc
@ -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 el9
|
||||||
%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
|
||||||
@ -1262,14 +1262,12 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
|
|||||||
|
|
||||||
# Prevent brp-java-repack-jars from being run
|
# Prevent brp-java-repack-jars from being run
|
||||||
%global __jar_repack 0
|
%global __jar_repack 0
|
||||||
# Define the OS the portable JDK is built on
|
|
||||||
%global pkgos rhel7
|
|
||||||
# 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}}
|
||||||
|
|
||||||
Name: java-%{javaver}-%{origin}
|
Name: java-%{javaver}-%{origin}
|
||||||
Version: %{newjavaver}.%{buildver}
|
Version: %{newjavaver}.%{buildver}
|
||||||
Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}
|
Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}.alma.1
|
||||||
# Equivalent for the portable build
|
# Equivalent for the portable build
|
||||||
%global prelease %{?eaprefix}%{portablerelease}%{?extraver}
|
%global prelease %{?eaprefix}%{portablerelease}%{?extraver}
|
||||||
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
|
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
|
||||||
|
Loading…
Reference in New Issue
Block a user