From fb878463006e4e9d86ec57058f627b964c777e8f Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Wed, 4 Dec 2024 11:55:31 -0500 Subject: [PATCH] Use compatiblename not name in uniquejavadocdir and uniquesuffix - 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. --- java-21-openjdk.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec index 4e70b5d..aedec12 100644 --- a/java-21-openjdk.spec +++ b/java-21-openjdk.spec @@ -418,9 +418,9 @@ # output dir stub %define installoutputdir() %{expand:install/jdk%{featurever}.install%{?1}} # 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 -%define uniquesuffix() %{expand:%{name}%{?1}} +%define uniquesuffix() %{expand:%{compatiblename}%{?1}} ################################################################# # 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 javadoc-zip own /usr/share/javadoc/java-21-openjdk - 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-71954 - Resolves: RHEL-69321