rpms/java-21-openjdk
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Attempt to avoid conflicts between subpackages

Browse Source 
- 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
This commit is contained in:
Andrew Hughes 2025-02-12 00:38:17 +00:00
parent 2769922b98
commit 6a8c015ccf
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
java-21-openjdk.spec
View File

@ -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 <gnu.andrew@redhat.com> - 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 <gnu.andrew@redhat.com> - 1:21.0.6.0.7-1
- Update to jdk-21.0.6+7 (GA)