From 5b0a7267f62355e00a8ca4050f38e788127cf8a7 Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Thu, 26 Sep 2024 16:54:30 -0400 Subject: [PATCH] Remove full version from uniquejavadocdir - Remove full version from uniquejavadocdir - Related: RHEL-68848 --- java-21-openjdk.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec index cb7a35d..5ed9847 100644 --- a/java-21-openjdk.spec +++ b/java-21-openjdk.spec @@ -418,7 +418,7 @@ # 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:%{fullversion}.%{_arch}%{?1}} +%define uniquejavadocdir() %{expand:%{name}%{?1}} # main id and dir of this jdk %define uniquesuffix() %{expand:%{fullversion}.%{_arch}%{?1}} @@ -995,7 +995,6 @@ fi %ghost %{_javadocdir}/java %ghost %{_javadocdir}/java-%{origin} %ghost %{_javadocdir}/java-%{javaver} -%ghost %{_javadocdir}/java-%{javaver}-%{origin} %endif %endif } @@ -1008,7 +1007,6 @@ fi %ghost %{_javadocdir}/java-zip %ghost %{_javadocdir}/java-%{origin}.zip %ghost %{_javadocdir}/java-%{javaver}.zip -%ghost %{_javadocdir}/java-%{javaver}-%{origin}.zip %endif %endif } @@ -2375,6 +2373,7 @@ done - Remove exit 0 from alternatives scriptlets - Move alternatives installation from posttrans to post - Replace jrelnk alternative with sdkdir +- Remove full version from uniquejavadocdir * Tue Oct 29 2024 Troy Dawson - 1:21.0.5.0.11-2.1 - Bump release for October 2024 mass rebuild: