Use el8 portable packages

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
@@ -977,12 +977,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
 }
 
@@ -995,8 +993,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
@@ -1007,10 +1003,8 @@ fi
 }
 
 %define files_javadoc_zip() %{expand:
+%dir %{_javadocdir}/%{uniquejavadocdir -- %{?1}}
 %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
@@ -1117,9 +1111,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}
 
@@ -1130,6 +1125,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}
@@ -1142,7 +1139,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}
@@ -1157,6 +1159,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}
 
@@ -2455,9 +2461,16 @@ exit 0
 %endif
 
 %changelog
-* Thu Feb 20 2025 Eduard Abdullin <eabdullin@almalinux.org> - 1:21.0.6.0.7-1.alma.1
+* Thu Feb 20 2025 Eduard Abdullin <eabdullin@almalinux.org> - 1:21.0.6.0.7-2.alma.1
 - Use el8 portable packages
 
+* Tue Feb 11 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.6.0.7-2
+- 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 <gnu.andrew@redhat.com> - 1:21.0.6.0.7-1
 - Update to jdk-21.0.6+7 (GA)
 - Update release notes to 21.0.6+7