[arch-commits] Commit in kapptemplate (kde-unstable/PKGBUILD trunk/PKGBUILD)

[Antonio Rojas]

    Date: Sunday, December 13, 2015 @ 00:30:04
  Author: arojas
Revision: 256014

Fix conflicts with plasma-framework 5.17

Modified:
  kapptemplate/kde-unstable/PKGBUILD
  kapptemplate/trunk/PKGBUILD

-----------------------+
 kde-unstable/PKGBUILD |    5 ++++-
 trunk/PKGBUILD        |    5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

Modified: kde-unstable/PKGBUILD
===================================================================
--- kde-unstable/PKGBUILD	2015-12-12 21:55:02 UTC (rev 256013)
+++ kde-unstable/PKGBUILD	2015-12-12 23:30:04 UTC (rev 256014)
@@ -4,7 +4,7 @@
 
 pkgname=kapptemplate
 pkgver=15.11.90
-pkgrel=2
+pkgrel=3
 pkgdesc='KDE Template Generator'
 url='http://kde.org/applications/development/kapptemplate/'
 arch=('i686' 'x86_64')
@@ -31,4 +31,7 @@
 package() {
   cd build
   make DESTDIR="$pkgdir" install
+
+# Fix conflict with plasma-framework
+  rm "$pkgdir"/usr/share/kdevappwizard/templates/qml-plasmoid.tar.bz2
 }

Modified: trunk/PKGBUILD
===================================================================
--- trunk/PKGBUILD	2015-12-12 21:55:02 UTC (rev 256013)
+++ trunk/PKGBUILD	2015-12-12 23:30:04 UTC (rev 256014)
@@ -4,7 +4,7 @@
 
 pkgname=kapptemplate
 pkgver=15.08.3
-pkgrel=2
+pkgrel=3
 pkgdesc='KDE Template Generator'
 url='http://kde.org/applications/development/kapptemplate/'
 arch=('i686' 'x86_64')
@@ -31,4 +31,7 @@
 package() {
   cd build
   make DESTDIR="$pkgdir" install
+
+# Fix conflict with plasma-framework
+  rm "$pkgdir"/usr/share/kdevappwizard/templates/qml-plasmoid.tar.bz2
 }