diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec index 34a3c95..cf925d3 100644 --- a/java-latest-openjdk.spec +++ b/java-latest-openjdk.spec @@ -1250,7 +1250,7 @@ Version: %{newjavaver}.%{buildver} # This package needs `.rolling` as part of Release so as to not conflict on install with # java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as # java-X-openjdk. See: https://bugzilla.redhat.com/show_bug.cgi?id=1647298 -Release: %{?eaprefix}%{rpmrelease}%{?extraver}.rolling.0.riscv64%{?dist} +Release: %{?eaprefix}%{rpmrelease}%{?extraver}.rolling.1.riscv64%{?dist} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -1964,12 +1964,12 @@ for suffix in %{build_loop} ; do # Install the jdk mkdir -p $RPM_BUILD_ROOT%{_jvmdir} -# Install icons -for s in 16 24 32 48 ; do - install -D -p -m 644 \ - ${src_image}/openjdk/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/java-%{javaver}-%{origin}.png -done +## Install icons +#for s in 16 24 32 48 ; do +# install -D -p -m 644 \ +# ${src_image}/openjdk/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png \ +# $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/java-%{javaver}-%{origin}.png +#done cp -a ${jdk_image} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix} @@ -2034,6 +2034,16 @@ commondocdir=${RPM_BUILD_ROOT}%{_defaultdocdir}/%{uniquejavadocdir -- $suffix} install -d -m 755 ${commondocdir} cp -a ${top_dir_abs_main_build_path}/NEWS ${commondocdir} +# Install icons and menu entries +for s in 16 24 32 48 ; do + # TODO!! publish in portables! + mkdir -p ${buildoutputdir}/src/java.desktop/unix/classes/sun/awt/X11/ #remove this line to once published + echo "PALCEHOLDER TODO REMOVE.ME" > ${buildoutputdir}/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png + install -D -p -m 644 \ + ${buildoutputdir}/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/java-%{javaver}-%{origin}.png +done + # Install desktop files install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps} for e in jconsole$suffix ; do @@ -2393,6 +2403,9 @@ cjc.mainProgram(args) %endif %changelog +* Sun Mar 10 2024 David Abdurachmanov - 1:20.0.2.0.9-2.rolling.1.riscv64 +- Revert to old icon placeholder + * Sat Mar 09 2024 David Abdurachmanov - 1:20.0.2.0.9-2.rolling.0.riscv64 - Build for riscv64