Tue Aug 21 00:02:33 UTC 2012

1 files changed, 7 insertions, 18 deletions

diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index 7eb040e06..c10db20f4 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 164831 2012-08-06 23:07:05Z andrea $
+# $Id: PKGBUILD 165426 2012-08-19 07:57:30Z andyrtr $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
@@ -13,7 +13,6 @@ pkgname=('calligra-filters'
          'calligra-tools'
          'calligra-karbon'
          'calligra-kexi'
-         'calligra-kounavail'
          'calligra-plan'
          'calligra-stage'
          'calligra-krita'
@@ -22,22 +21,21 @@ pkgname=('calligra-filters'
          'calligra-handbook'
          'calligra-braindump'
          'calligra-flow')
-pkgver=2.4.3
-pkgrel=3
+pkgver=2.5.0
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.calligra-suite.org/'
 license=('FDL1.2' 'GPL2' 'LGPL')
 makedepends=('cmake' 'automoc4' 'boost ' 'eigen2'
              'kdepimlibs' 'libpqxx' 'freetds' 'xbase'
              'kdegraphics-okular' 'gsl' 'kdeedu-marble'
-             'libwpd' 'libwpg' 'pstoedit' 'glew'
+             'libwps' 'libwpg' 'pstoedit' 'glew'
              'fftw' 'opengtl' 'lcms2' 'libkdcraw')
 groups=('calligra')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('469d639f17e3d6a186baabd899147e39')
+md5sums=('bea9b5e9d95691caaba385ef5522a60d')
 
 build() {
-  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgbase}-${pkgver} \
@@ -51,7 +49,8 @@ build() {
 
 package_calligra-filters() {
   pkgdesc="Filters for the Calligra office suite"
-  optdepends=('libwpg: Corel WordPerfect Graphics image importer')
+  optdepends=('libwpg: Corel WordPerfect Graphics image importer'
+              'libwps: Microsoft Works file word processor format import')
   conflicts=('koffice-filters')
   replaces=('koffice-filters')
   install=calligra-filters.install
@@ -162,16 +161,6 @@ package_calligra-kexi() {
   make DESTDIR="${pkgdir}" install
 }
 
-package_calligra-kounavail() {
-  pkgdesc="Unavailable Calligra Document"
-  depends=('calligra-libs')
-  conflicts=('koffice-kounavail')
-  replaces=('koffice-kounavail')
-
-  cd "${srcdir}"/build/kounavail
-  make DESTDIR="${pkgdir}" install
-}
-
 package_calligra-plan() {
   pkgdesc="Calligra Project Management Component"
   depends=('calligra-words')