Fix changes in Provides from system_jdk support.
Re-introduce java-openjdk-src & java-openjdk-demo for system_jdk builds. Fix accidental renaming of java-openjdk-devel to java-devel-openjdk.
This commit is contained in:
parent
849813b283
commit
72bd67076a
|
@ -219,7 +219,7 @@
|
|||
%global top_level_dir_name %{origin}
|
||||
%global minorver 0
|
||||
%global buildver 7
|
||||
%global rpmrelease 2
|
||||
%global rpmrelease 4
|
||||
# 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
|
||||
%global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} )
|
||||
|
@ -914,9 +914,9 @@ 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
|
||||
Provides: java-devel-%{origin}%1 =%{epoch}:%{version}-%{release}
|
||||
Provides: java-sdk-%{origin}%1 = %{epoch}:%{version}-%{release}
|
||||
Provides: java-devel%1 = %{epoch}:%{version}-%{release}
|
||||
Provides: java-%{origin}-devel%1 =%{epoch}:%{version}-%{release}
|
||||
Provides: java-sdk%1 = %{epoch}:%{version}-%{release}
|
||||
%endif
|
||||
}
|
||||
|
@ -942,6 +942,7 @@ Provides: java-%{javaver}-demo%1 = %{epoch}:%{version}-%{release}
|
|||
Provides: java-%{javaver}-%{origin}-demo%1 = %{epoch}:%{version}-%{release}
|
||||
%if %is_system_jdk
|
||||
Provides: java-demo%1 = %{epoch}:%{version}-%{release}
|
||||
Provides: java-%{origin}-demo%1 = %{epoch}:%{version}-%{release}
|
||||
%endif
|
||||
}
|
||||
|
||||
|
@ -972,6 +973,7 @@ Provides: java-%{javaver}-src%1 = %{epoch}:%{version}-%{release}
|
|||
Provides: java-%{javaver}-%{origin}-src%1 = %{epoch}:%{version}-%{release}
|
||||
%if %is_system_jdk
|
||||
Provides: java-src%1 = %{epoch}:%{version}-%{release}
|
||||
Provides: java-%{origin}-src%1 = %{epoch}:%{version}-%{release}
|
||||
%endif
|
||||
}
|
||||
|
||||
|
@ -1837,6 +1839,10 @@ require "copy_jdk_configs.lua"
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Jul 09 2020 Andrew Hughes <gnu.andrew@redhat.com> - 1:14.0.1.7-4.rolling
|
||||
- Re-introduce java-openjdk-src & java-openjdk-demo for system_jdk builds.
|
||||
- Fix accidental renaming of java-openjdk-devel to java-devel-openjdk.
|
||||
|
||||
* Thu Apr 23 2020 Severin Gehwolf <sgehwolf@redhat.com> - 1:14.0.1.7-2.rolling
|
||||
- Fix vendor version to 20.3 (from 19.9)
|
||||
|
||||
|
|
Loading…
Reference in New Issue