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

Cleanup java_javadoc_rpo macro, removing unused argument and duplicated Requires

Browse Source 
Related: RHEL-78710
This commit is contained in:
Andrew Hughes 2025-02-18 11:54:45 +00:00
parent 6f7c5a3e8e
commit b151319713
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
java-21-openjdk.spec
View File

@ -366,7 +366,7 @@
%global top_level_dir_name %{vcstag} %global top_level_dir_name %{vcstag}
%global top_level_dir_name_backup %{top_level_dir_name}-backup %global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 7 %global buildver 7
%global rpmrelease 2 %global rpmrelease 3
# Settings used by the portable build # Settings used by the portable build
%global portablerelease 1 %global portablerelease 1
# Portable suffix differs between RHEL and CentOS # Portable suffix differs between RHEL and CentOS
@ -1139,19 +1139,14 @@ Provides: java-%{origin}-demo%{?1} = %{epoch}:%{version}-%{release}
# Potentially, the legal documentation could be split into a small package # Potentially, the legal documentation could be split into a small package
# which the javadoc and headless packages then depend on, but it does not # 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. # seem worth the additional disruption just to have docs installed and no JDK.
# Arguments:
# - 1 = package name suffix (called twice for javadoc-zip with nil & -zip)
%define java_javadoc_rpo() %{expand: %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}
# Postun requires alternatives to uninstall javadoc alternative
Requires(postun): %{alternatives_requires}
# Standard JPackage javadoc provides # Standard JPackage javadoc provides
Provides: java-%{javaver}-javadoc%{?1}%{?2} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-javadoc%{?1} = %{epoch}:%{version}-%{release}
Provides: java-%{javaver}-%{origin}-javadoc%{?1}%{?2} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{origin}-javadoc%{?1} = %{epoch}:%{version}-%{release}
%if %is_system_jdk %if %is_system_jdk
Provides: java-javadoc%{?1}%{?2} = %{epoch}:%{version}-%{release} Provides: java-javadoc%{?1} = %{epoch}:%{version}-%{release}
%endif %endif
} }
@ -1717,25 +1712,34 @@ Summary: %{origin_nice} %{featurever} API documentation
Group: Documentation Group: Documentation
%endif %endif
Requires: javapackages-filesystem Requires: javapackages-filesystem
Requires: %{name}-headless%{?_isa} = %{epoch}:%{version}-%{release}
OrderWithRequires: %{name}-headless%{?_isa} = %{epoch}:%{version}-%{release}
Obsoletes: javadoc-slowdebug < 1:13.0.0.33-1.rolling Obsoletes: javadoc-slowdebug < 1:13.0.0.33-1.rolling
# Post requires alternatives to install javadoc alternative
Requires(post): %{alternatives_requires}
# Postun requires alternatives to uninstall javadoc alternative
Requires(postun): %{alternatives_requires}
%{java_javadoc_rpo -- %{nil} %{nil}} %{java_javadoc_rpo -- %{nil}}
%description javadoc %description javadoc
The %{origin_nice} %{featurever} API documentation. The %{origin_nice} %{featurever} API documentation.
%endif
%if %{include_normal_build}
%package javadoc-zip %package javadoc-zip
Summary: %{origin_nice} %{featurever} API documentation compressed in a single archive Summary: %{origin_nice} %{featurever} API documentation compressed in a single archive
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30) %if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
Group: Documentation Group: Documentation
%endif %endif
Requires: javapackages-filesystem Requires: javapackages-filesystem
Requires: %{name}-headless%{?_isa} = %{epoch}:%{version}-%{release}
OrderWithRequires: %{name}-headless%{?_isa} = %{epoch}:%{version}-%{release}
Obsoletes: javadoc-zip-slowdebug < 1:13.0.0.33-1.rolling Obsoletes: javadoc-zip-slowdebug < 1:13.0.0.33-1.rolling
# Post requires alternatives to install javadoc alternative
Requires(post): %{alternatives_requires}
# Postun requires alternatives to uninstall javadoc alternative
Requires(postun): %{alternatives_requires}
%{java_javadoc_rpo -- %{nil} -zip} %{java_javadoc_rpo -- -zip}
%{java_javadoc_rpo -- %{nil} %{nil}} %{java_javadoc_rpo -- %{nil}}
%description javadoc-zip %description javadoc-zip
The %{origin_nice} %{featurever} API documentation compressed in a single archive. The %{origin_nice} %{featurever} API documentation compressed in a single archive.
@ -2457,6 +2461,10 @@ exit 0
%endif %endif
%changelog %changelog
* Tue Feb 18 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.6.0.7-3
- Cleanup java_javadoc_rpo macro, removing unused argument and duplicated Requires
- Related: RHEL-78710
* Tue Feb 11 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.6.0.7-2 * Tue Feb 11 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.6.0.7-2
- Attempt to avoid conflicts between subpackages - Attempt to avoid conflicts between subpackages
- Make javadoc packages depend on headless package for legal documentation - Make javadoc packages depend on headless package for legal documentation