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

Remove full version from uniquejavadocdir

Browse Source 
- Remove full version from uniquejavadocdir
- Related: RHEL-68848
This commit is contained in:
Thomas Fitzsimmons 2024-09-26 16:54:30 -04:00
parent c5e1dc484f
commit 5b0a7267f6
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java-21-openjdk.spec
View File

@ -418,7 +418,7 @@
# 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:%{fullversion}.%{_arch}%{?1}} %define uniquejavadocdir() %{expand:%{name}%{?1}}
# main id and dir of this jdk # main id and dir of this jdk
%define uniquesuffix() %{expand:%{fullversion}.%{_arch}%{?1}} %define uniquesuffix() %{expand:%{fullversion}.%{_arch}%{?1}}
@ -995,7 +995,6 @@ fi
%ghost %{_javadocdir}/java %ghost %{_javadocdir}/java
%ghost %{_javadocdir}/java-%{origin} %ghost %{_javadocdir}/java-%{origin}
%ghost %{_javadocdir}/java-%{javaver} %ghost %{_javadocdir}/java-%{javaver}
%ghost %{_javadocdir}/java-%{javaver}-%{origin}
%endif %endif
%endif %endif
} }
@ -1008,7 +1007,6 @@ fi
%ghost %{_javadocdir}/java-zip %ghost %{_javadocdir}/java-zip
%ghost %{_javadocdir}/java-%{origin}.zip %ghost %{_javadocdir}/java-%{origin}.zip
%ghost %{_javadocdir}/java-%{javaver}.zip %ghost %{_javadocdir}/java-%{javaver}.zip
%ghost %{_javadocdir}/java-%{javaver}-%{origin}.zip
%endif %endif
%endif %endif
} }
@ -2375,6 +2373,7 @@ done
- Remove exit 0 from alternatives scriptlets - Remove exit 0 from alternatives scriptlets
- Move alternatives installation from posttrans to post - Move alternatives installation from posttrans to post
- Replace jrelnk alternative with sdkdir - Replace jrelnk alternative with sdkdir
- Remove full version from uniquejavadocdir
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:21.0.5.0.11-2.1 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:21.0.5.0.11-2.1
- Bump release for October 2024 mass rebuild: - Bump release for October 2024 mass rebuild: