Switch buildjdkver to being featurever (19)

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
David Abdurachmanov 2022-09-18 05:45:16 +03:00
parent 541022eb07
commit 0f023d6450
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
1 changed files with 5 additions and 2 deletions

View File

@ -331,7 +331,7 @@
# buildjdkver is usually same as %%{featurever},
# but in time of bootstrap of next jdk, it is featurever-1,
# and this it is better to change it here, on single place
%global buildjdkver 18
%global buildjdkver %{featurever}
# We don't add any LTS designator for STS packages (Fedora and EPEL).
# We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
%if 0%{?rhel} && !0%{?epel}
@ -1307,7 +1307,7 @@ Version: %{newjavaver}.%{buildver}
# This package needs `.rolling` as part of Release so as to not conflict on install with
# java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as
# java-X-openjdk. See: https://bugzilla.redhat.com/show_bug.cgi?id=1647298
Release: %{?eaprefix}%{rpmrelease}%{?extraver}.rolling.1.riscv64%{?dist}
Release: %{?eaprefix}%{rpmrelease}%{?extraver}.rolling.2.riscv64%{?dist}
# 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
@ -2685,6 +2685,9 @@ cjc.mainProgram(args)
%endif
%changelog
* Sun Sep 18 2022 David Abdurachmanov <davidlt@rivosinc.com> - 1:19.0.0.0.36-2.rolling.2.riscv64
- Switch buildjdkver back to being featurever (19)
* Sat Sep 17 2022 David Abdurachmanov <davidlt@rivosinc.com> - 1:19.0.0.0.36-2.rolling.1.riscv64
- Add riscv64 to sa_arches