Tue Aug 6 01:53:08 PDT 2013

2 files changed, 29 insertions, 26 deletions

diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index 2026b56cb..220bd1a35 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 192008 2013-08-04 04:49:59Z lcarlier $
+# $Id: PKGBUILD 192059 2013-08-05 14:17:28Z andyrtr $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=calligra
-pkgname=('calligra-filters'
-         'calligra-libs'
-         'calligra-plugins'
-         'calligra-tools'
+pkgname=('calligra-braindump'
+         'calligra-extras'
+         'calligra-filters'
+         'calligra-flow'
+         'calligra-handbook'
          'calligra-karbon'
          'calligra-kexi'
-         'calligra-plan'
-         'calligra-stage'
          'calligra-krita'
+         'calligra-libs'
+         'calligra-plan'
+         'calligra-plugins'
          'calligra-sheets'
-         'calligra-words'
-         'calligra-handbook'
-         'calligra-braindump'
-         'calligra-flow')
-pkgver=2.6.4
-pkgrel=2
+         'calligra-stage'
+         'calligra-words')
+pkgver=2.7.1
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.calligra-suite.org/'
 license=('FDL1.2' 'GPL2' 'LGPL')
@@ -27,8 +27,8 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen2' 'kdeedu-marble'
              'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw'
              'openjpeg' 'kdegraphics-okular' 'pstoedit' 'vc')
 groups=('calligra')
-source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('a38fdc882888469ea8b0dea949c05dda')
+source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz")
+md5sums=('9cf909ddf57ecb16d4370cc1062d0f7f')
 
 prepare() {
   mkdir build
@@ -81,16 +81,8 @@ package_calligra-plugins() {
 
   cd "${srcdir}"/build/plugins
   make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-tools() {
-  pkgdesc="Tools for the Calligra office suite"
-  depends=('calligra-libs')
-  conflicts=('koffice-tools')
-  replaces=('koffice-tools')
-  install=calligra-tools.install
-
-  cd "${srcdir}"/build/tools
+  
+  cd "${srcdir}"/build/3rdparty/kdchart
   make DESTDIR="${pkgdir}" install
 }
 
@@ -223,3 +215,15 @@ package_calligra-flow() {
   cd "${srcdir}"/build/flow
   make DESTDIR="${pkgdir}" install
 }
+
+package_calligra-extras() {
+  pkgdesc="Calligra suite extras"
+  depends=('calligra-libs')
+  optdepends=('kdegraphics-okular')
+  conflicts=('calligra-tools')
+  replaces=('calligra-tools')
+  install=calligra-extras.install
+
+  cd "${srcdir}"/build/extras
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/calligra/calligra-tools.install b/extra/calligra/calligra-extras.install
index 6c87527e2..b8c7ebf27 100644
--- a/extra/calligra/calligra-tools.install
+++ b/extra/calligra/calligra-extras.install
@@ -1,5 +1,4 @@
 post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 	update-desktop-database -q
 }