Update to 5.18.4.1

2 files changed, 16 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 86d67cef64ea..98a75a096c9d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = discover-snap
 	pkgdesc = KDE and Plasma resources management GUI with snap support
-	pkgver = 5.15.6
+	pkgver = 5.18.4.1
 	pkgrel = 1
 	url = https://userbase.kde.org/Discover
 	arch = x86_64
@@ -19,16 +19,22 @@ pkgbase = discover-snap
 	depends = archlinux-appstream-data
 	depends = hicolor-icon-theme
 	depends = kirigami2
+	depends = discount
+	depends = kuserfeedback
+	depends = snapd
+	depends = snapd-glib
 	optdepends = packagekit-qt5: to manage packages from Arch Linux repositories
 	optdepends = flatpak: Flatpak packages support
 	optdepends = fwupd: firmware update support
-	source = https://download.kde.org/stable/plasma/5.15.6/discover-snap-5.15.6.tar.xz
-	source = https://download.kde.org/stable/plasma/5.15.6/discover-snap-5.15.6.tar.xz.sig
+	provides = discover
+	conflicts = discover
+	source = https://download.kde.org/stable/plasma/5.18.4/discover-5.18.4.1.tar.xz
+	source = https://download.kde.org/stable/plasma/5.18.4/discover-5.18.4.1.tar.xz.sig
 	validpgpkeys = 2D1D5B0588357787DE9EE225EC94D18F7F05997E
 	validpgpkeys = 0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D
 	validpgpkeys = D07BD8662C56CB291B316EB2F5675605C74E02CF
 	validpgpkeys = 1FA881591C26B276D7A5518EEAAF29B42A678C20
-	sha256sums = 0e07a49d3ee93434452d69330b11653546a2104601ec08518be111ba7967f1b0
+	sha256sums = b89c19df39286c2ec0b1128369372a7628fa5403ea5d9af244ddd7c1042c2802
 	sha256sums = SKIP
 
 pkgname = discover-snap
diff --git a/PKGBUILD b/PKGBUILD
index f92d7b4052ec..c1f1d295cd1e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,20 +4,22 @@
 
 _pkgname=discover
 pkgname=discover-snap
-pkgver=5.15.6
+pkgver=5.18.4.1
 pkgrel=1
 pkgdesc='KDE and Plasma resources management GUI with snap support'
 arch=(x86_64)
 url='https://userbase.kde.org/Discover'
 license=(LGPL)
+conflicts=(discover)
+provides=(discover)
 depends=(knewstuff kitemmodels kdeclarative qt5-graphicaleffects appstream-qt archlinux-appstream-data
-         hicolor-icon-theme kirigami2)
+         hicolor-icon-theme kirigami2 discount kuserfeedback snapd snapd-glib)
 makedepends=(extra-cmake-modules plasma-framework packagekit-qt5 flatpak fwupd)
 optdepends=('packagekit-qt5: to manage packages from Arch Linux repositories' 'flatpak: Flatpak packages support'
             'fwupd: firmware update support')
 groups=(plasma)
-source=("https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('0e07a49d3ee93434452d69330b11653546a2104601ec08518be111ba7967f1b0'
+source=("https://download.kde.org/stable/plasma/${pkgver%.*}/$_pkgname-$pkgver.tar.xz"{,.sig})
+sha256sums=('b89c19df39286c2ec0b1128369372a7628fa5403ea5d9af244ddd7c1042c2802'
             'SKIP')
 validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E'  # Jonathan Riddell <jr@jriddell.org>
               '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D'  # Bhushan Shah <bshah@kde.org>
@@ -31,8 +33,6 @@ prepare() {
 build() {
   cd build
   cmake ../$_pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
     -DCMAKE_INSTALL_LIBEXECDIR=lib \
     -DBUILD_SnapBackend=ON \
     -DBUILD_TESTING=OFF