git » plasma-workspace.git » commit f9b6c36

drkonqi shouldn't conflict with kdebase-workspace

author Andrea Scarpino
2015-01-29 09:57:52 UTC
committer Andrea Scarpino
2015-01-29 09:57:52 UTC
parent 73d9f3423e68dcf78e7ff7a9d98bf2aaf1eca42f

drkonqi shouldn't conflict with kdebase-workspace

PKGBUILD +2 -2

diff --git a/PKGBUILD b/PKGBUILD
index 8871725..260ff75 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgbase=plasma-workspace
 pkgname=('plasma-workspace' 'drkonqi')
 pkgver=5.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc='KDE Plasma Workspace'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/workspace/plasma-workspace'
@@ -19,7 +19,6 @@ depends=('knewstuff' 'kjsembed' 'knotifyconfig' 'libxdamage' 'kwayland'
          'xorg-xmessage' 'xorg-xprop')
 makedepends=('extra-cmake-modules' 'kdoctools' 'kwin' 'gpsd' 'baloo-frameworks'
              'krunner')
-conflicts=('kdebase-workspace')
 groups=('plasma')
 source=("http://download.kde.org/stable/plasma/${pkgver}/${pkgbase}-${pkgver}.tar.xz"
         'kde.pam')
@@ -49,6 +48,7 @@ build() {
 package_plasma-workspace() {
   optdepends=('plasma-workspace-wallpapers: additional wallpapers'
               'gpsd: GPS support for geolocation')
+  conflicts=('kdebase-workspace')
 
   cd build
   make DESTDIR="${pkgdir}" install