From 2769922b9838df122d1c5cd5cb8d3702c6130b37 Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Wed, 12 Feb 2025 00:17:42 +0000 Subject: [PATCH 1/3] Bump rpmrelease for next build Related: RHEL-78710 --- java-21-openjdk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec index 464a748..25282ac 100644 --- a/java-21-openjdk.spec +++ b/java-21-openjdk.spec @@ -366,7 +366,7 @@ %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup %global buildver 7 -%global rpmrelease 1 +%global rpmrelease 2 # Settings used by the portable build %global portablerelease 1 # Portable suffix differs between RHEL and CentOS @@ -2451,6 +2451,9 @@ exit 0 %endif %changelog +* Tue Feb 11 2025 Andrew Hughes - 1:21.0.6.0.7-2 +- rebuilt + * Thu Feb 06 2025 Andrew Hughes - 1:21.0.6.0.7-1 - Update to jdk-21.0.6+7 (GA) - Update release notes to 21.0.6+7 From 6a8c015ccfac423d22cd0514beecb85c75ef8274 Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Wed, 12 Feb 2025 00:38:17 +0000 Subject: [PATCH 2/3] Attempt to avoid conflicts between subpackages - Make javadoc packages depend on headless package for legal documentation - Only include legal subdirectory in headless package, not demo, src & javadoc{,-zip} Related: RHEL-78710 --- java-21-openjdk.spec | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec index 25282ac..68f05d8 100644 --- a/java-21-openjdk.spec +++ b/java-21-openjdk.spec @@ -973,12 +973,10 @@ fi } %define files_demo() %{expand: -%license %{_jvmdir}/%{sdkdir -- %{?1}}/legal %{_jvmdir}/%{sdkdir -- %{?1}}/demo } %define files_src() %{expand: -%license %{_jvmdir}/%{sdkdir -- %{?1}}/legal %{_jvmdir}/%{sdkdir -- %{?1}}/lib/src.zip } @@ -991,8 +989,6 @@ fi %define files_javadoc() %{expand: %doc %{_javadocdir}/%{uniquejavadocdir -- %{?1}} -%license %{_jvmdir}/%{sdkdir -- %{?1}}/legal -%dir %{_jvmdir}/%{sdkdir -- %{?1}} %if %is_system_jdk %if %{is_release_build -- %{?1}} %ghost %{_javadocdir}/java @@ -1005,8 +1001,6 @@ fi %define files_javadoc_zip() %{expand: %doc %{_javadocdir}/%{uniquejavadocdir -- %{?1}}.zip %doc %{_javadocdir}/%{uniquejavadocdir -- %{?1}} -%license %{_jvmdir}/%{sdkdir -- %{?1}}/legal -%dir %{_jvmdir}/%{sdkdir -- %{?1}} %if %is_system_jdk %if %{is_release_build -- %{?1}} %ghost %{_javadocdir}/java-zip @@ -1113,9 +1107,10 @@ Requires: %{name}-devel%{?1}%{?_isa} = %{epoch}:%{version}-%{release} OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release} } +# Requires the devel package which contains jmod and jlink %define java_jmods_rpo() %{expand: -# Requires devel package -# as jmods are bytecode, they should be OK without any _isa +# As most jmods are bytecode, they should be OK without any _isa +# (java.base mod does contain native libraries) Requires: %{name}-devel%{?1} = %{epoch}:%{version}-%{release} OrderWithRequires: %{name}-headless%{?1} = %{epoch}:%{version}-%{release} @@ -1126,6 +1121,8 @@ Provides: java-jmods%{?1} = %{epoch}:%{version}-%{release} %endif } +# The demo package depends on the full graphical JRE which is needed to +# run the demos. %define java_demo_rpo() %{expand: Requires: %{name}%{?1}%{?_isa} = %{epoch}:%{version}-%{release} OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release} @@ -1138,7 +1135,12 @@ Provides: java-%{origin}-demo%{?1} = %{epoch}:%{version}-%{release} %endif } +# The javadoc packages depend on the headless package for the legal documentation. +# Potentially, the legal documentation could be split into a small package +# which the javadoc and headless packages then depend on, but it does not +# seem worth the additional disruption just to have docs installed and no JDK. %define java_javadoc_rpo() %{expand: +Requires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release} OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release} # Post requires alternatives to install javadoc alternative Requires(post): %{alternatives_requires} @@ -1153,6 +1155,10 @@ Provides: java-javadoc%{?1}%{?2} = %{epoch}:%{version}-%{release} %endif } +# The src package depends on the headless package for the legal documentation. +# Potentially, the legal documentation could be split into a small package +# which the src and headless package then depend on, but it does not +# seem worth the additional disruption just to have sources installed and no JDK. %define java_src_rpo() %{expand: Requires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release} @@ -2452,7 +2458,10 @@ exit 0 %changelog * Tue Feb 11 2025 Andrew Hughes - 1:21.0.6.0.7-2 -- rebuilt +- Attempt to avoid conflicts between subpackages + - Make javadoc packages depend on headless package for legal documentation + - Only include legal subdirectory in headless package, not demo, src & javadoc{,-zip} +- Resolves: RHEL-78710 * Thu Feb 06 2025 Andrew Hughes - 1:21.0.6.0.7-1 - Update to jdk-21.0.6+7 (GA) From 6f7c5a3e8efced90b3334ff624ee8004da09893e Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Wed, 12 Feb 2025 00:34:37 +0000 Subject: [PATCH 3/3] Change javadoc-zip to just own the top-level directory, not include the entire subtree Resolves: RHEL-78710 --- java-21-openjdk.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec index 68f05d8..097affc 100644 --- a/java-21-openjdk.spec +++ b/java-21-openjdk.spec @@ -999,8 +999,8 @@ fi } %define files_javadoc_zip() %{expand: +%dir %{_javadocdir}/%{uniquejavadocdir -- %{?1}} %doc %{_javadocdir}/%{uniquejavadocdir -- %{?1}}.zip -%doc %{_javadocdir}/%{uniquejavadocdir -- %{?1}} %if %is_system_jdk %if %{is_release_build -- %{?1}} %ghost %{_javadocdir}/java-zip @@ -2461,6 +2461,7 @@ exit 0 - Attempt to avoid conflicts between subpackages - Make javadoc packages depend on headless package for legal documentation - Only include legal subdirectory in headless package, not demo, src & javadoc{,-zip} + - Change javadoc-zip to just own the top-level directory, not include the entire subtree - Resolves: RHEL-78710 * Thu Feb 06 2025 Andrew Hughes - 1:21.0.6.0.7-1