Pull java 1.8 as java-devel, not java 11

All Java stack in ROSA requires java 1.8 as a BR
This commit is contained in:
Mikhail Novosyolov 2022-02-05 08:51:42 +03:00
parent 53ab1acbdc
commit 64aaadf675

View file

@ -114,6 +114,9 @@
# while JDK is a techpreview(is_system_jdk=0), some provides are turned off. Once jdk stops to be an techpreview, move it to 1
# as sytem JDK, we mean any JDK which can run whole system java stack without issues (like bytecode issues, module issues, dependencies...)
%global is_system_jdk 1
# XXX ROSA-specific: commit 6dab1797 accidently put is_system_jdk=1 instead of 0,
# now leaving java 11 with this, but exclude devel provides to restore java 1.8 as default JDK and leave java 11 as default JRE
%global devel_provides 0
%global aarch64 aarch64 arm64 armv8
# we need to distinguish between big and little endian PPC64
@ -354,7 +357,7 @@
%global top_level_dir_name %{origin}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 7
%global rpmrelease 7
%global rpmrelease 8
#%%global tagsuffix %%{nil}
# 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
%if %is_system_jdk
@ -1062,7 +1065,7 @@ Provides: java-sdk-%{javaver}-%{origin}%{?1} = %{epoch}:%{version}-%{release}
Provides: java-sdk-%{javaver}%{?1} = %{epoch}:%{version}-%{release}
Provides: java-%{javaver}-devel%{?1} = %{epoch}:%{version}-%{release}
Provides: java-%{javaver}-%{origin}-devel%{?1} = %{epoch}:%{version}-%{release}
%if %is_system_jdk
%if %{is_system_jdk} && %{devel_provides}
Provides: java-devel-%{origin}%{?1} = %{epoch}:%{version}-%{release}
Provides: java-sdk-%{origin}%{?1} = %{epoch}:%{version}-%{release}
Provides: java-devel%{?1} = %{epoch}:%{version}-%{release}