Fri Sep 30 23:14:37 UTC 2011

2 files changed, 44 insertions, 96 deletions

diff --git a/kde-unstable/calligra/PKGBUILD b/kde-unstable/calligra/PKGBUILD
index 0329e3566..9a9662026 100644
--- a/kde-unstable/calligra/PKGBUILD
+++ b/kde-unstable/calligra/PKGBUILD
@@ -1,6 +1,6 @@
-# $Id: PKGBUILD 131881 2011-07-16 15:46:51Z andrea $
+# $Id: PKGBUILD 139111 2011-09-29 14:02:55Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=calligra
 pkgname=('calligra-filters'
@@ -12,34 +12,28 @@ pkgname=('calligra-filters'
          'calligra-templates'
          'calligra-tools'
          'calligra-karbon'
-         'calligra-karbon-doc'
          'calligra-kexi'
-         'calligra-kexi-doc'
-         'calligra-kformula'
-         'calligra-kformula-doc'
          'calligra-kounavail'
-         'calligra-kplato'
+         'calligra-plan'
          'calligra-stage'
-         'calligra-stage-doc'
          'calligra-krita'
          'calligra-tables'
-         'calligra-tables-doc'
          'calligra-words'
          'calligra-handbook'
          'calligra-thesaurus-doc'
          'calligra-braindump'
          'calligra-flow')
-pkgver=2.3.73
-pkgrel=1
+pkgver=2.3.81
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.calligra-suite.org'
 license=('FDL1.2' 'GPL2' 'LGPL')
-makedepends=('kdelibs' 'kdepimlibs' 'eigen2' 'freetds' 'kdegraphics-okular'
-             'libgsf' 'libwpd' 'libwpg' 'pstoedit' 'glew' 'gsl' 'cmake' 'automoc4'
-             'boost' 'libkdcraw' 'libpqxx' 'fftw' 'opengtl')
+makedepends=('kdepimlibs' 'eigen2' 'freetds' 'kdegraphics-okular' 'libgsf'
+             'libwpd' 'libwpg' 'pstoedit' 'glew' 'gsl' 'cmake' 'automoc4'
+             'boost' 'libkdcraw' 'libpqxx' 'fftw' 'opengtl' 'lcms2')
 groups=('calligra')
 source=("http://download.kde.org/unstable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('bed6d1d2f8fcef2dc5da4ceede1f0839')
+md5sums=('7f475e22fa3740b2da2f6478880d6341')
 
 build() {
   cd "${srcdir}"
@@ -49,7 +43,11 @@ build() {
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=ON \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBUILD_mobile=OFF
+    -DBUILD_active=OFF \
+    -DBUILD_mobile=OFF \
+    -DBUILD_mysql=OFF \
+    -DKDCRAW_LOCAL_FOUND=/usr/lib/libkdcraw.so \
+    -DWITH_Marble=OFF
   make
 }
 
@@ -146,66 +144,27 @@ package_calligra-tools() {
 package_calligra-karbon() {
   pkgdesc="Create scalable vector drawings"
   depends=('calligra-libs' 'calligra-templates')
-  conflicts=('koffice-karbon')
-  replaces=('koffice-karbon')
+  conflicts=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc')
+  replaces=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc')
   install=calligra-karbon.install
 
   cd "${srcdir}"/build/karbon
   make DESTDIR="${pkgdir}" install
 }
 
-package_calligra-karbon-doc() {
-  pkgdesc="Documentation for Karbon"
-  depends=('calligra-karbon')
-  conflicts=('koffice-karbon-doc')
-  replaces=('koffice-karbon-doc')
-
-  cd "${srcdir}"/build/doc/karbon
-  make DESTDIR="${pkgdir}" install
-}
-
 package_calligra-kexi() {
   pkgdesc="Develop desktop database applications"
   depends=('calligra-libs' 'calligra-templates')
-  conflicts=('koffice-kexi')
-  replaces=('koffice-kexi')
+  conflicts=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc')
+  replaces=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc')
   install=calligra-kexi.install
 
   cd "${srcdir}"/build/kexi
   make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-kexi-doc() {
-  pkgdesc="Documentation for Kexi"
-  depends=('calligra-kexi')
-  conflicts=('koffice-kexi-doc')
-  replaces=('koffice-kexi-doc')
-
   cd "${srcdir}"/build/doc/kexi
   make DESTDIR="${pkgdir}" install
 }
 
-package_calligra-kformula() {
-  pkgdesc="Formula editor"
-  depends=('calligra-libs' 'calligra-templates')
-  conflicts=('koffice-kformula')
-  replaces=('koffice-kformula')
-  install=calligra-kformula.install
-
-  cd "${srcdir}"/build/kformula
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-kformula-doc() {
-  pkgdesc="Documentation for KFormula"
-  depends=('calligra-kformula')
-  conflicts=('koffice-kformula-doc')
-  replaces=('koffice-kformula-doc')
-
-  cd "${srcdir}"/build/doc/kformula
-  make DESTDIR="${pkgdir}" install
-}
-
 package_calligra-kounavail() {
   pkgdesc="Unavailable Calligra Document"
   depends=('calligra-libs')
@@ -216,14 +175,14 @@ package_calligra-kounavail() {
   make DESTDIR="${pkgdir}" install
 }
 
-package_calligra-kplato() {
+package_calligra-plan() {
   pkgdesc="Calligra Project Management Component"
   depends=('calligra-words')
-  conflicts=('koffice-kplato')
-  replaces=('koffice-kplato')
-  install=calligra-kplato.install
+  conflicts=('koffice-kplato' 'calligra-kplato')
+  replaces=('koffice-kplato' 'calligra-kplato')
+  install=calligra-plan.install
 
-  cd "${srcdir}"/build/kplato
+  cd "${srcdir}"/build/plan
   make DESTDIR="${pkgdir}" install
 }
 
@@ -231,21 +190,11 @@ package_calligra-stage() {
   pkgdesc="Write presentation documents"
   depends=('calligra-libs' 'calligra-templates')
   optdepends=('calligra-filters: import/export filters')
-  conflicts=('koffice-kpresenter')
-  replaces=('koffice-kpresenter')
+  conflicts=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc')
+  replaces=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc')
   install=calligra-stage.install
 
-  cd "${srcdir}"/build/kpresenter
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-stage-doc() {
-  pkgdesc="Documentation for Stage"
-  depends=('calligra-stage')
-  conflicts=('koffice-kpresenter-doc')
-  replaces=('koffice-kpresenter-doc')
-
-  cd "${srcdir}"/build/doc/stage
+  cd "${srcdir}"/build/stage
   make DESTDIR="${pkgdir}" install
 }
 
@@ -254,8 +203,8 @@ package_calligra-krita() {
   depends=('calligra-libs' 'calligra-templates' 'calligra-plugins' 'glew'
            'qimageblitz' 'poppler-qt' 'openexr' 'opengtl')
   optdepends=('calligra-filters: import/export filters')
-  conflicts=('koffice-krita')
-  replaces=('koffice-krita')
+  conflicts=('koffice-krita' 'calligra-krita-doc')
+  replaces=('koffice-krita' 'calligra-krita-doc')
   install=calligra-krita.install
 
   cd "${srcdir}"/build/krita
@@ -266,19 +215,12 @@ package_calligra-tables() {
   pkgdesc="Write spreadsheet documents"
   depends=('calligra-libs' 'calligra-templates' 'calligra-plugins' 'gsl')
   optdepends=('calligra-filters: import/export filters')
-  conflicts=('koffice-kspread')
-  replaces=('koffice-kspread')
+  conflicts=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc')
+  replaces=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc')
   install=calligra-tables.install
 
   cd "${srcdir}"/build/tables
   make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-tables-doc() {
-  pkgdesc="Documentation for Tables"
-  depends=('calligra-tables')
-  conflicts=('koffice-kspread-doc')
-  replaces=('koffice-kspread-doc')
 
   cd "${srcdir}"/build/doc/tables
   make DESTDIR="${pkgdir}" install
@@ -326,17 +268,11 @@ package_calligra-braindump() {
 package_calligra-flow() {
   pkgdesc="Flowchart & Diagram Editing"
   install=calligra-flow.install
+  conflicts=('calligra-flow-doc')
+  replaces=('calligra-flow-doc')
 
   cd "${srcdir}"/build/flow
   make DESTDIR="${pkgdir}" install
 }
 
-package_calligra-flow-doc() {
-  pkgdesc="Documentation for Flow"
-  depends=('calligra-flow')
-
-  cd "${srcdir}"/build/doc/flow
-  make DESTDIR="${pkgdir}" install
-}
-
 ##### package apps done #####
diff --git a/kde-unstable/calligra/calligra-plan.install b/kde-unstable/calligra/calligra-plan.install
new file mode 100644
index 000000000..c2179f6e2
--- /dev/null
+++ b/kde-unstable/calligra/calligra-plan.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
\ No newline at end of file