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

[Antonio Rojas]

    Date: Saturday, December 12, 2015 @ 00:31:24
  Author: arojas
Revision: 255813

Drop KDE4 daemon

Modified:
  kactivities4/trunk/PKGBUILD

----------+
 PKGBUILD |   23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-11 23:23:33 UTC (rev 255812)
+++ PKGBUILD	2015-12-11 23:31:24 UTC (rev 255813)
@@ -2,9 +2,9 @@
 # Maintainer: Andrea Scarpino <andrea at archlinux.org>
 
 pkgbase=kactivities4
-pkgname=('kactivities4' 'libkactivities4')
+pkgname=(libkactivities4)
 pkgver=4.13.3
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs/kactivities'
 license=('GPL' 'FDL')
@@ -26,26 +26,13 @@
   make
 }
 
-package_kactivities4() {
-  pkgdesc='The KActivity Manager Daemon'
-  depends=('libkactivities4')
-  replaces=('kactivities')
-  conflicts=('kactivities')
-  provides=('kactivities')
-
-  cd build
-  install -Dm755 src/service/kactivitymanagerd \
-    "${pkgdir}"/usr/bin/kactivitymanagerd
-}
-
 package_libkactivities4() {
   pkgdesc='API for using and interacting with the Activity Manager'
   depends=('kdelibs')
 
   cd build
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="$pkgdir" install
 
-  # Fix conflicts
-  rm "${pkgdir}"/usr/bin/kactivitymanagerd
-  rmdir "${pkgdir}"/usr/bin
+  # Fix conflicts with kactivities
+  rm -r "$pkgdir"/usr/bin
 }