From 5ebd9f1a7cd09eb8f60ed4289ca7e968a0fb6fbd Mon Sep 17 00:00:00 2001
From: renner <80410025+renner0e@users.noreply.github.com>
Date: Fri, 20 Mar 2026 14:35:31 +0100
Subject: [PATCH] chore: use aurora package variant for plasma-setup (#1933)

needs: https://github.com/ublue-os/packages/pull/1199

fixes: https://github.com/ublue-os/aurora/issues/1704

Co-authored-by: inffy <10782843+inffy@users.noreply.github.com>
---
 build_files/base/01-packages.sh         | 7 ++++---
 build_files/base/16-override-install.sh | 7 -------
 build_files/base/20-tests.sh            | 5 ++++-
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/build_files/base/01-packages.sh b/build_files/base/01-packages.sh
index c569a17d..45f61659 100755
--- a/build_files/base/01-packages.sh
+++ b/build_files/base/01-packages.sh
@@ -287,9 +287,10 @@ dnf -y install plasma-firewall-"${PLASMA_VERS}"
 # https://invent.kde.org/plasma/plasma-setup/-/issues/72
 dnf -y copr enable ublue-os/staging
 dnf -y copr disable ublue-os/staging
-dnf5 -y swap \
-  --repo=copr:copr.fedorainfracloud.org:ublue-os:staging \
-plasma-setup plasma-setup-"${PLASMA_VERS}"
+dnf -y swap --repo=copr:copr.fedorainfracloud.org:ublue-os:staging \
+  plasma-setup plasma-setup-"${PLASMA_VERS}"-*.aurora
+
+dnf versionlock add plasma-setup
 
 # we can't remove plasma-lookandfeel-fedora package because it is a dependency of plasma-desktop
 rpm --erase --nodeps plasma-lookandfeel-fedora
diff --git a/build_files/base/16-override-install.sh b/build_files/base/16-override-install.sh
index ab5e03c2..a5144d96 100755
--- a/build_files/base/16-override-install.sh
+++ b/build_files/base/16-override-install.sh
@@ -42,11 +42,4 @@ sed -i '/^\[homes\]/,/^\[/{/^\[homes\]/d;/^\[/!d}' /etc/samba/smb.conf
 sed -i "s/org.gnome.Ptyxis/org.kde.konsole/" /usr/share/kde-settings/kde-profile/default/xdg/kicker-extra-favoritesrc
 sed -i "s/org.gnome.Ptyxis/org.kde.konsole/" /usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/layouts/org.kde.plasma.desktop-layout.js
 
-# so we can share the plasma-setup package with bazzite
-# symlinking ours to be named like bazzite's default convergence wallpaper
-# https://invent.kde.org/plasma/plasma-setup/-/issues/72
-# https://github.com/ublue-os/packages/pull/1191
-mkdir -p /usr/share/wallpapers/.ublue-plasma-setup/contents/images
-ln -s /usr/share/backgrounds/default.jxl /usr/share/wallpapers/.ublue-plasma-setup/contents/images/3940x2160.jxl
-
 echo "::endgroup::"
diff --git a/build_files/base/20-tests.sh b/build_files/base/20-tests.sh
index 3b1e1b1d..13929143 100755
--- a/build_files/base/20-tests.sh
+++ b/build_files/base/20-tests.sh
@@ -43,7 +43,10 @@ test -f /usr/share/flatpak/preinstall.d/bazaar.preinstall
 test -f /usr/lib/systemd/system/flatpak-add-fedora-repos.service && false
 
 # Basic smoke test to check if the flatpak version is from our copr
-flatpak preinstall --help
+flatpak preinstall --help > /dev/null 2>&1
+
+# Make sure to not pull in the bazzite one
+rpm -q plasma-setup --qf "%{RELEASE}" | grep -q aurora
 
 test -f /usr/share/doc/aurora/aurora.pdf
 test -f /usr/share/homebrew.tar.zst