[arch-commits] Commit in plasma-desktop/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Saturday, April 4, 2015 @ 10:50:35
  Author: arojas
Revision: 235437

Rename kcfg files to avoid conflicting with kdebase-kdepasswd, the kdepasswd binary is needed to change the password in the User account KCM module

Modified:
  plasma-desktop/trunk/PKGBUILD

----------+
 PKGBUILD |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-04 08:49:14 UTC (rev 235436)
+++ PKGBUILD	2015-04-04 08:50:35 UTC (rev 235437)
@@ -5,7 +5,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/'
@@ -16,7 +16,7 @@
 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"
@@ -49,4 +49,8 @@
 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
 }