Date: Thursday, January 29, 2015 @ 10:57:52 Author: andrea Revision: 230237
upgpkg: plasma-workspace 5.2.0-3 drkonqi shouldn't conflict with kdebase-workspace Modified: plasma-workspace/trunk/PKGBUILD ----------+ PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-01-29 09:52:10 UTC (rev 230236) +++ PKGBUILD 2015-01-29 09:57:52 UTC (rev 230237) @@ -6,7 +6,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' @@ -20,7 +20,6 @@ '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') @@ -50,6 +49,7 @@ package_plasma-workspace() { optdepends=('plasma-workspace-wallpapers: additional wallpapers' 'gpsd: GPS support for geolocation') + conflicts=('kdebase-workspace') cd build make DESTDIR="${pkgdir}" install