qt-mobility moved from conflicts to depends to provide new location provider plugin

This commit is contained in:
Giuseppe 2012-11-19 15:40:16 +00:00
parent 052d23ab3d
commit 0f683ac922

View File

@ -13,17 +13,16 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=kdeedu-marble pkgname=kdeedu-marble
_pkgname=marble _pkgname=marble
pkgver=${_kdever} pkgver=${_kdever}
pkgrel=1 pkgrel=2
pkgdesc="Desktop Globe" pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/" url="http://kde.org/applications/education/marble/"
screenshot="http://www.kde.org/images/screenshots/marble.png" screenshot="http://www.kde.org/images/screenshots/marble.png"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url='http://www.kde.org' url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL') license=('GPL' 'LGPL' 'FDL')
depends=("kde-runtime>=${_kdever}" "gpsd" 'shapelib') depends=("kde-runtime>=${_kdever}" "gpsd" 'shapelib' 'qt-mobility')
makedepends=('cmake' 'automoc4') makedepends=('cmake' 'automoc4')
provides=('marble') provides=('marble')
conflicts=('qt-mobility')
groups=("kde" "kdeedu" "kde-uninstall") groups=("kde" "kdeedu" "kde-uninstall")
categories=('education') categories=('education')
options=('docs' '!splithdr' 'splitdbg' 'log') options=('docs' '!splithdr' 'splitdbg' 'log')