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

[Andrea Scarpino]

    Date: Sunday, November 29, 2009 @ 12:39:22
  Author: andrea
Revision: 59915

undo

Modified:
  akonadi/trunk/PKGBUILD

----------+
 PKGBUILD |   42 ++++++++----------------------------------
 1 file changed, 8 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-11-29 17:28:52 UTC (rev 59914)
+++ PKGBUILD	2009-11-29 17:39:22 UTC (rev 59915)
@@ -1,17 +1,17 @@
-# $Id: $
+# $ Id: $
 # Maintainer: Andrea Scarpino <andrea at archlinux.org>
 # Contributor: Pierre Schmitz <pierre at archlinux.de>
 
-pkgbase=akonadi
-pkgname=('akonadi' 'akonadi-server')
+pkgname=akonadi
 pkgver=1.2.1
-pkgrel=3
+pkgrel=2
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 arch=('i686' 'x86_64')
 url='http://www.akonadi-project.org'
 license=('LGPL')
-makedepends=('shared-mime-info' 'boost' 'mysql>=5.1.41' 'soprano'
-	'pkgconfig' 'cmake' 'automoc4')
+depends=('shared-mime-info' 'boost' 'mysql>=5.1.41' 'soprano')
+makedepends=('pkgconfig' 'cmake' 'automoc4')
+install=$pkgname.install
 source=("http://download.akonadi-project.org/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('f9c1d000844f31c67360078ddf60bec2')
 
@@ -19,37 +19,11 @@
   cd ${srcdir}
   mkdir build
   cd build
-  cmake ../${pkgbase}-${pkgver} \
+  cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_SKIP_RPATH=ON \
     -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
   make || return 1
+  make DESTDIR=${pkgdir} install
 }
-
-package_akonadi(){
-  desc="Libraries for the Akonadi PIM storage service"
-  depends=('shared-mime-info' 'boost' 'soprano')
-
-  cd ${srcdir}/build/libs/
-  make DESTDIR=${pkgdir} install || return 1
-  
-  # install cmake files
-  install -d ${pkgdir}/usr/lib/cmake/Akonadi
-  install -Dm644 ../AkonadiConfig{,Version}.cmake \
-    ${pkgdir}/usr/lib/cmake/Akonadi || return 1
-}
-
-package_akonadi-server(){
-  desc="Akonadi PIM storage service"
-  depends=('akonadi' 'mysql')
-  install=akonadi.install
-
-  cd ${srcdir}/build/server
-  make DESTDIR=${pkgdir} install || return 1
-
-  # install mime file
-  install -d ${pkgdir}/usr/share/mime/packages
-  install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/akonadi-mime.xml \
-    ${pkgdir}/usr/share/mime/packages
-}