funkemunky/packages
1
0
Fork 0
mirror of https://github.com/terrapkg/packages.git synced 2026-06-05 19:32:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23 from getchoo/i-suck

Browse Source 
fix conflicts (again)
This commit is contained in:
lleyton
2022-11-08 09:24:58 -08:00
committed by GitHub
parent 1769a850a1 900bde7370
commit 8a0f312d67
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
anda/games/prismlauncher-nightly/prismlauncher-nightly.spec
+5 -4
View File
@@ -112,14 +112,15 @@ Recommends: gamemoded
Recommends: gamemode
%endif
Conflicts: %{real_name}
Conflicts: %{real_name}-qt5
Conflicts: %{real_name}
Conflicts: %{real_name}-qt5
%if %{with qt6}
Conflicts: %{real_name}-qt5-nightly
Conflicts: %{real_name}-qt5-nightly
%else
Conflicts: %{real_name}-nightly
Conflicts: %{real_name}-nightly
%endif
%description
A custom launcher for Minecraft that allows you to easily manage
multiple installations of Minecraft at once (Fork of MultiMC)
anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec
+5 -4
View File
@@ -112,14 +112,15 @@ Recommends: gamemoded
Recommends: gamemode
%endif
Conflicts: %{realname}
Conflicts: %{realname}-qt5
Conflicts: %{real_name}
Conflicts: %{real_name}-qt5
%if %{with qt6}
Conflicts: %{realname}-qt5-nightly
Conflicts: %{real_name}-qt5-nightly
%else
Conflicts: %{realname}-nightly
Conflicts: %{real_name}-nightly
%endif
%description
A custom launcher for Minecraft that allows you to easily manage
multiple installations of Minecraft at once (Fork of MultiMC)
anda/games/prismlauncher-qt5/prismlauncher-qt5.spec
+2 -2
View File
@@ -98,9 +98,9 @@ Recommends: gamemode
%endif
%if %{with qt6}
Conflicts: %{real_name}-qt5
Conflicts: %{real_name}-qt5
%else
Conflicts: %{real_name}
Conflicts: %{real_name}
%endif
anda/games/prismlauncher/prismlauncher.spec
+3 -2
View File
@@ -98,11 +98,12 @@ Recommends: gamemode
%endif
%if %{with qt6}
Conflicts: %{real_name}-qt5
Conflicts: %{real_name}-qt5
%else
Conflicts: %{real_name}
Conflicts: %{real_name}
%endif
%description
A custom launcher for Minecraft that allows you to easily manage
multiple installations of Minecraft at once (Fork of MultiMC)