[arch-commits] Commit in kactivities-frameworks/trunk (PKGBUILD)

[Andrea Scarpino]

    Date: Wednesday, June 4, 2014 @ 18:58:22
  Author: andrea
Revision: 214257

upgpkg: kactivities-frameworks 4.100.0-2

Add missing kio dependence and merge packages

Modified:
  kactivities-frameworks/trunk/PKGBUILD

----------+
 PKGBUILD |   34 ++++++++++------------------------
 1 file changed, 10 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-04 16:56:27 UTC (rev 214256)
+++ PKGBUILD	2014-06-04 16:58:22 UTC (rev 214257)
@@ -1,14 +1,19 @@
 # $Id$
 # Maintainer: Andrea Scarpino <andrea at archlinux.org>
 
-pkgbase=kactivities-frameworks
-pkgname=('kactivities-frameworks' 'libkactivities-frameworks')
+pkgname=kactivities-frameworks
 pkgver=4.100.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
+pkgdesc="The KActivity Manager Daemon"
 url='https://projects.kde.org/projects/kde/kdelibs/kactivities'
 license=('LGPL')
-makedepends=('qt5-declarative' 'kservice' 'extra-cmake-modules' 'boost')
+depends=('kio')
+makedepends=('extra-cmake-modules' 'boost')
+provides=('kactivities')
+conflicts=('kactivities4' 'libkactivities-frameworks')
+replaces=('libkactivities-frameworks')
+groups=('kf5')
 source=("http://download.kde.org/unstable/frameworks/${pkgver}/kactivities-${pkgver}.tar.xz")
 md5sums=('45e20c18096f272ce665a120aa32ac83')
 
@@ -29,26 +34,7 @@
   make
 }
 
-package_kactivities-frameworks() {
-  pkgdesc="The KActivity Manager Daemon"
-  depends=('kwindowsystem' 'libkactivities-frameworks')
-  provides=('kactivities')
-  conflicts=('kactivities')
-  groups=('kf5')
-
+package() {
   cd build
-  install -Dm755 src/service/kactivitymanagerd \
-    "${pkgdir}"/usr/bin/kactivitymanagerd
-}
-
-package_libkactivities-frameworks() {
-  pkgdesc="Core components for the KDE's Activities"
-  depends=('kconfig' 'qt5-declarative' 'ki18n' 'kcoreaddons' 'kdbusaddons')
-
-  cd build
   make DESTDIR="${pkgdir}" install
-
-  # Fix conflicts
-  rm "${pkgdir}"/usr/bin/kactivitymanagerd
-  rmdir "${pkgdir}"/usr/bin
 }