From c0e3ea11e002e4c2bfd68388abc0aabeed7ce8f0 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Fri, 12 Apr 2024 10:12:04 -0700 Subject: [PATCH] main/postmarketos-artwork: fix upgrade failure with -gnome subpackage (MR 5031) This subpackage now installs a file that was previously in the other subpackage it is meant to replace, leading to upgrade conflicts that have to be manually resolved (i.e. with apk fix) Fixes: 126f43220 and 1712a2d03 --- main/postmarketos-artwork/APKBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main/postmarketos-artwork/APKBUILD b/main/postmarketos-artwork/APKBUILD index a2f9c17e4..bbd359419 100644 --- a/main/postmarketos-artwork/APKBUILD +++ b/main/postmarketos-artwork/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Oliver Smith pkgname=postmarketos-artwork pkgver=5 -pkgrel=1 +pkgrel=2 pkgdesc="Meta package for the postmarketOS artwork" url="https://postmarketos.org/" arch="noarch" @@ -73,6 +73,7 @@ wallpapers_extra() { wallpapers_gnome() { pkgdesc="Wallpaper configuration for GNOME-based UIs" + replaces="postmarketos-base-ui-gnome-wallpaper-pmos" install_if="postmarketos-artwork-wallpapers=$pkgver-r$pkgrel postmarketos-base-ui-gnome" install -Dm644 "$srcdir"/postmarketos-gnome.xml \