git » plasma-desktop.git » commit ce98c6e

diff --git a/PKGBUILD b/PKGBUILD
index ae4d526..10a79b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=plasma-desktop
 pkgver=5.2.2
-pkgrel=2
+pkgrel=3
 pkgdesc='KDE Plasma Desktop'
 arch=('i686' 'x86_64')
 url='https://www.kde.org/workspaces/plasmadesktop/'
@@ -15,7 +15,7 @@ depends=('qt5-graphicaleffects' 'powerdevil' 'polkit-kde-frameworks'
 makedepends=('extra-cmake-modules' 'kdoctools' 'boost' 'baloo-frameworks')
 optdepends=('baloo-frameworks: system indexing'
            'plasma-nm: Network manager applet')
-conflicts=('kdebase-workspace' 'kdebase-kdepasswd')
+conflicts=('kdebase-workspace')
 install="${pkgname}.install"
 groups=('plasma')
 source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz"
@@ -48,4 +48,8 @@ build() {
 package() {
   cd build
   make DESTDIR="${pkgdir}" install
+
+# Rename kcfg files to avoid conflicting with kdebase-kdepasswd
+  mv "$pkgdir"/usr/share/config.kcfg/kcm_useraccount{,5}.kcfg
+  mv "$pkgdir"/usr/share/config.kcfg/kcm_useraccount_pass{,5}.kcfg
 }