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

Use compatiblename not name in uniquejavadocdir and uniquesuffix

Browse Source 
- Use compatiblename not name in uniquejavadocdir and uniquesuffix
- Related: RHEL-68848

%{name} is not defined until Name is specified later in the file.  Use
compatible name in early macros.  __provides_exclude_from and
__requires_exclude_from in particular need this change, otherwise the
regular expression expanded from %{uniquesuffix ...} contains a
literal %{name} and does not match libraries that are intended to be
excluded.
This commit is contained in:
Thomas Fitzsimmons 2024-12-04 11:55:31 -05:00
parent 0d40b6cf94
commit fb87846300
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java-21-openjdk.spec
View File

@ -418,9 +418,9 @@
# output dir stub # output dir stub
%define installoutputdir() %{expand:install/jdk%{featurever}.install%{?1}} %define installoutputdir() %{expand:install/jdk%{featurever}.install%{?1}}
# we can copy the javadoc to not arched dir, or make it not noarch # we can copy the javadoc to not arched dir, or make it not noarch
%define uniquejavadocdir() %{expand:%{name}%{?1}} %define uniquejavadocdir() %{expand:%{compatiblename}%{?1}}
# main id and dir of this jdk # main id and dir of this jdk
%define uniquesuffix() %{expand:%{name}%{?1}} %define uniquesuffix() %{expand:%{compatiblename}%{?1}}
################################################################# #################################################################
# fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349 # fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349
@ -2408,6 +2408,7 @@ end
- Make headless own /usr/share/doc/java-21-openjdk - Make headless own /usr/share/doc/java-21-openjdk
- Make javadoc-zip own /usr/share/javadoc/java-21-openjdk - Make javadoc-zip own /usr/share/javadoc/java-21-openjdk
- Delete old conflicting links in pretrans for headless, javadoc and javadoc-zip - Delete old conflicting links in pretrans for headless, javadoc and javadoc-zip
- Use compatiblename not name in uniquejavadocdir and uniquesuffix
- Resolves: RHEL-71920 - Resolves: RHEL-71920
- Resolves: RHEL-71954 - Resolves: RHEL-71954
- Resolves: RHEL-69321 - Resolves: RHEL-69321