From 61d486f627cf11f3a6c942154bc9bbf2efd99c46 Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Thu, 9 Jul 2020 14:22:52 +0000 Subject: [PATCH] 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. --- java-11-openjdk.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index 96154bc..ef4b967 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -230,7 +230,7 @@ %global top_level_dir_name %{origin} %global minorver 0 %global buildver 8 -%global rpmrelease 0 +%global rpmrelease 1 #%%global tagsuffix "" # priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when moving to 11 we had to add another digit %if %is_system_jdk @@ -948,9 +948,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 } @@ -981,6 +981,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 } @@ -1007,6 +1008,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 } @@ -1963,6 +1965,10 @@ require "copy_jdk_configs.lua" %changelog +* Thu Jul 09 2020 Andrew Hughes - 1:11.0.8.8-0.1.ea +- Re-introduce java-openjdk-src & java-openjdk-demo for system_jdk builds. +- Fix accidental renaming of java-openjdk-devel to java-devel-openjdk. + * Tue Jun 30 2020 Andrew Hughes - 1:11.0.8.8-0.0.ea - Update to shenandoah-jdk-11.0.8+8 (EA)