From f2e27d125aec9cbb162b1c6bc7b0eabcea0803b6 Mon Sep 17 00:00:00 2001 From: lea Date: Thu, 4 Apr 2024 03:38:46 -0700 Subject: [PATCH] prismlauncher: move JREs to weak deps, add java 21 for snapshots (#1040) (#1042) (cherry picked from commit 045b6b310e2e1fa5c27ad43f12ab468a87467970) Co-authored-by: seth --- .../prismlauncher-nightly/prismlauncher-nightly.spec | 5 +++-- .../prismlauncher-qt5-nightly.spec | 5 +++-- anda/games/prismlauncher-qt5/prismlauncher-qt5.spec | 10 +++++++--- anda/games/prismlauncher/prismlauncher.spec | 10 +++++++--- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 36d1b70788..210538f523 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -76,8 +76,9 @@ Requires(postun): desktop-file-utils Requires: qt%{qt_version}-qtimageformats Requires: qt%{qt_version}-qtsvg Requires: javapackages-filesystem -Requires: java-17-openjdk -Requires: java-1.8.0-openjdk +Recommends: java-21-openjdk +Recommends: java-17-openjdk +Suggests: java-1.8.0-openjdk # xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 Recommends: xrandr diff --git a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec index 393e7f9eee..b90b692ed0 100644 --- a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec +++ b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec @@ -76,8 +76,9 @@ Requires(postun): desktop-file-utils Requires: qt%{qt_version}-qtimageformats Requires: qt%{qt_version}-qtsvg Requires: javapackages-filesystem -Requires: java-17-openjdk -Requires: java-1.8.0-openjdk +Recommends: java-21-openjdk +Recommends: java-17-openjdk +Suggests: java-1.8.0-openjdk # xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 Recommends: xrandr diff --git a/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec b/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec index a3476f26f6..62c7b7b60b 100644 --- a/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec +++ b/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec @@ -23,7 +23,7 @@ Name: prismlauncher Name: prismlauncher-qt5 %endif Version: 8.2 -Release: 1%?dist +Release: 2%?dist Summary: Minecraft launcher with ability to manage multiple instances # see COPYING.md for more information # each file in the source also contains a SPDX-License-Identifier header that declares its license @@ -61,8 +61,9 @@ Requires(postun): desktop-file-utils Requires: qt%{qt_version}-qtimageformats Requires: qt%{qt_version}-qtsvg Requires: javapackages-filesystem -Requires: java-17-openjdk -Requires: java-1.8.0-openjdk +Recommends: java-21-openjdk +Recommends: java-17-openjdk +Suggests: java-1.8.0-openjdk # xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 Recommends: xrandr @@ -131,6 +132,9 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt %changelog +* Wed Apr 03 2024 seth - 8.2-2 +- move JREs to weak deps, add java 21 for snapshots + * Wed Jul 26 2023 seth - 7.2-2 - remove terra-fractureiser-detector from recommends, use proper build platform diff --git a/anda/games/prismlauncher/prismlauncher.spec b/anda/games/prismlauncher/prismlauncher.spec index 7b76e82a66..9c067c0f7b 100644 --- a/anda/games/prismlauncher/prismlauncher.spec +++ b/anda/games/prismlauncher/prismlauncher.spec @@ -23,7 +23,7 @@ Name: prismlauncher Name: prismlauncher-qt5 %endif Version: 8.2 -Release: 1%?dist +Release: 2%?dist Summary: Minecraft launcher with ability to manage multiple instances # see COPYING.md for more information # each file in the source also contains a SPDX-License-Identifier header that declares its license @@ -61,8 +61,9 @@ Requires(postun): desktop-file-utils Requires: qt%{qt_version}-qtimageformats Requires: qt%{qt_version}-qtsvg Requires: javapackages-filesystem -Requires: java-17-openjdk -Requires: java-1.8.0-openjdk +Recommends: java-21-openjdk +Recommends: java-17-openjdk +Suggests: java-1.8.0-openjdk # xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 Recommends: xrandr @@ -131,6 +132,9 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt %changelog +* Wed Apr 03 2024 seth - 8.2-2 +- move JREs to weak deps, add java 21 for snapshots + * Wed Jul 26 2023 seth - 7.2-2 - remove terra-fractureiser-detector from recommends, use proper build platform