diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/nix/polymc/default.nix | 2 | ||||
| -rw-r--r-- | packages/rpm/polymc.spec | 32 |
2 files changed, 17 insertions, 17 deletions
diff --git a/packages/nix/polymc/default.nix b/packages/nix/polymc/default.nix index 5da00ff8..b6bf6c5e 100644 --- a/packages/nix/polymc/default.nix +++ b/packages/nix/polymc/default.nix @@ -88,7 +88,7 @@ mkDerivation rec { postInstall = '' install -Dm644 ../launcher/resources/multimc/scalable/launcher.svg $out/share/pixmaps/polymc.svg - install -Dm644 ${desktopItem}/share/applications/polymc.desktop $out/share/applications/org.polymc.PolyMC.desktop + install -Dm644 ${desktopItem}/share/applications/polymc.desktop $out/share/applications/org.polymc.polymc.desktop # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 wrapProgram $out/bin/polymc \ diff --git a/packages/rpm/polymc.spec b/packages/rpm/polymc.spec index f5a6fe07..0b659ed5 100644 --- a/packages/rpm/polymc.spec +++ b/packages/rpm/polymc.spec @@ -6,7 +6,7 @@ Name: polymc Version: 1.0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Minecraft launcher with ability to manage multiple instances # @@ -61,23 +61,18 @@ Source0: https://github.com/PolyMC/PolyMC/archive/%{version}/%{name}-%{ve Source1: https://github.com/MultiMC/libnbtplusplus/archive/%{libnbtplusplus_commit}/libnbtplusplus-%{libnbtplusplus_shortcommit}.tar.gz Source2: https://github.com/PolyMC/quazip/archive/%{quazip_commit}/quazip-%{quazip_shortcommit}.tar.gz -BuildRequires: cmake3 +BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: gcc-c++ -# Fix warning: Could not complete Guile gdb module initialization from: -# /usr/share/gdb/guile/gdb/boot.scm -BuildRequires: gdb-headless - BuildRequires: java-devel -BuildRequires: pkgconfig(gl) -BuildRequires: pkgconfig(Qt5) -BuildRequires: pkgconfig(zlib) +BuildRequires: %{?suse_version:lib}qt5-qtbase-devel +BuildRequires: zlib-devel -Requires: java-headless -Requires: pkgconfig(gl) -Requires: pkgconfig(Qt5) -Requires: pkgconfig(zlib) +# Minecraft < 1.17 +Recommends: java-1.8.0-openjdk-headless +# Minecraft >= 1.17 +Recommends: java-17-openjdk-headless %description PolyMC is a free, open source launcher for Minecraft. It allows you to have @@ -105,7 +100,6 @@ mv -f libraries/libnbtplusplus-%{libnbtplusplus_commit} libraries/libnbtplusplus %cmake_build - %install %cmake_install @@ -115,8 +109,11 @@ echo "%{_libdir}/%{name}" > "%{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_ %check +# skip tests on systems that aren't officially supported +%if ! 0%{?suse_version} %ctest -desktop-file-validate %{buildroot}%{_datadir}/applications/org.polymc.PolyMC.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/org.polymc.polymc.desktop +%endif %files @@ -127,11 +124,14 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.polymc.PolyMC.des %{_datadir}/%{name}/* %{_datadir}/metainfo/org.polymc.PolyMC.metainfo.xml %{_datadir}/icons/hicolor/scalable/apps/org.polymc.PolyMC.svg -%{_datadir}/applications/org.polymc.PolyMC.desktop +%{_datadir}/applications/org.polymc.polymc.desktop %config %{_sysconfdir}/ld.so.conf.d/* %changelog +* Mon Jan 24 2022 Jan Drögehoff <sentrycraft123@gmail.com> - 1.0.5-2 +- remove explicit dependencies, correct dependencies to work on OpenSuse + * Sun Jan 09 2022 Jan Drögehoff <sentrycraft123@gmail.com> - 1.0.5-1 - Update to 1.0.5 |