Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[f38] prismlauncher: move JREs to weak deps, add java 21 for snapshots (#1040) #1041

Merged
merged 2 commits into from
Apr 4, 2024
+20 −10
Merged

[f38] prismlauncher: move JREs to weak deps, add java 21 for snapshots (#1040) #1041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3be7e0
prismlauncher: move JREs to weak deps, add java 21 for snapshots (#1040)
getchoo Apr 4, 2024
c9ab8bd
Merge branch 'f38' into backport/f38/pr-1040
raboneko Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions anda/games/prismlauncher-nightly/prismlauncher-nightly.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 7 additions & 3 deletions anda/games/prismlauncher-qt5/prismlauncher-qt5.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -131,6 +132,9 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt


%changelog
* Wed Apr 03 2024 seth <getchoo at tuta dot io> - 8.2-2
- move JREs to weak deps, add java 21 for snapshots

* Wed Jul 26 2023 seth <getchoo at tuta dot io> - 7.2-2
- remove terra-fractureiser-detector from recommends, use proper build platform

Expand Down
10 changes: 7 additions & 3 deletions anda/games/prismlauncher/prismlauncher.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -131,6 +132,9 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt


%changelog
* Wed Apr 03 2024 seth <getchoo at tuta dot io> - 8.2-2
- move JREs to weak deps, add java 21 for snapshots

* Wed Jul 26 2023 seth <getchoo at tuta dot io> - 7.2-2
- remove terra-fractureiser-detector from recommends, use proper build platform

Expand Down
Loading