[arch-commits] Commit in calligra/trunk (PKGBUILD calligra-tools.install)

[Andrea Scarpino]

    Date: Thursday, August 1, 2013 @ 10:22:32
  Author: andrea
Revision: 191935

Upstream release; poppler rebuild

Modified:
  calligra/trunk/PKGBUILD
Deleted:
  calligra/trunk/calligra-tools.install

------------------------+
 PKGBUILD               |   52 +++++++++++++++++++++++++----------------------
 calligra-tools.install |   12 ----------
 2 files changed, 28 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-01 07:28:30 UTC (rev 191934)
+++ PKGBUILD	2013-08-01 08:22:32 UTC (rev 191935)
@@ -3,22 +3,22 @@
 # Maintainer: Andrea Scarpino <andrea at 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-krita'
+         'calligra-libs'
          'calligra-plan'
+         'calligra-plugins'
+         'calligra-sheets'
          'calligra-stage'
-         'calligra-krita'
-         'calligra-sheets'
-         'calligra-words'
-         'calligra-handbook'
-         'calligra-braindump'
-         'calligra-flow')
-pkgver=2.6.4
-pkgrel=2
+         '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 @@
              '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 @@
 
   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 @@
   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
+}

Deleted: calligra-tools.install
===================================================================
--- calligra-tools.install	2013-08-01 07:28:30 UTC (rev 191934)
+++ calligra-tools.install	2013-08-01 08:22:32 UTC (rev 191935)
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}