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>
This commit is contained in:
parent
d707c687b0
commit
5ebd9f1a7c
3 changed files with 8 additions and 11 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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::"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue