make compatible with current KF5

2 files changed, 9 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bc0468aee236..174f7c6c28ca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = rkward
 	pkgdesc = An easy to use and easily extensible IDE/GUI for R
 	pkgver = 0.7.0b
-	pkgrel = 1
+	pkgrel = 2
 	url = http://rkward.kde.org/
 	arch = x86_64
 	license = GPL
@@ -10,6 +10,8 @@ pkgbase = rkward
 	depends = kdewebkit
 	depends = ktexteditor
 	depends = r
+	provides = rkward
+	conflicts = rkward-frameworks-git
 	source = http://download.kde.org/stable/rkward/0.7.0/src/rkward-0.7.0b.tar.gz
 	md5sums = a678008a571c7dacd5c13d62817ead7a
 
diff --git a/PKGBUILD b/PKGBUILD
index ed0b881dcafe..c8beee54ebc7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,18 +2,20 @@
 
 pkgname=rkward
 pkgver=0.7.0b
-pkgrel=1
+pkgrel=2
 pkgdesc="An easy to use and easily extensible IDE/GUI for R"
 url="http://rkward.kde.org/"
 arch=('x86_64')
 license=('GPL')
 depends=('kdewebkit' 'ktexteditor' 'r')
 makedepends=('kdoctools' 'extra-cmake-modules')
+provides=('rkward')
+conflicts=('rkward-frameworks-git')
 source=("http://download.kde.org/stable/rkward/${pkgver//b/}/src/rkward-$pkgver.tar.gz")
 md5sums=('a678008a571c7dacd5c13d62817ead7a')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
   cmake \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
@@ -22,6 +24,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
+  rm $pkgdir/usr/share/org.kde.syntax-highlighting/syntax/r.xml
 }