From 900bde737046a1da9b15a81f9682e766186172be Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 8 Nov 2022 01:20:07 -0500 Subject: [PATCH] [prismlauncher-qt5] fix conflicts macro --- .../prismlauncher-nightly/prismlauncher-nightly.spec | 9 +++++---- .../prismlauncher-qt5-nightly.spec | 9 +++++---- anda/games/prismlauncher-qt5/prismlauncher-qt5.spec | 4 ++-- anda/games/prismlauncher/prismlauncher.spec | 5 +++-- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index a516bb4b4a..7775295a1e 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -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) diff --git a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec index 9819175224..8bd7ba1afb 100644 --- a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec +++ b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec @@ -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) diff --git a/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec b/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec index 82c30a0ecf..3998a4a89d 100644 --- a/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec +++ b/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec @@ -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 diff --git a/anda/games/prismlauncher/prismlauncher.spec b/anda/games/prismlauncher/prismlauncher.spec index 99cf4fe844..24965e18d0 100644 --- a/anda/games/prismlauncher/prismlauncher.spec +++ b/anda/games/prismlauncher/prismlauncher.spec @@ -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)