[arch-commits] Commit in koffice/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Ronald van Haren]

    Date: Monday, November 2, 2009 @ 09:25:21
  Author: ronald
Revision: 57825

Merged revisions 56905,57824 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/koffice/trunk

........
  r56905 | ronald | 2009-10-30 10:40:43 +0100 (Fri, 30 Oct 2009) | 1 line
  
  fixes to PKGBUILD deps, bump version number
........
  r57824 | ronald | 2009-11-02 15:24:50 +0100 (Mon, 02 Nov 2009) | 2 lines
  
  upgpkg: koffice 2.0.91-1
      update to 2.1 rc
........

Modified:
  koffice/repos/extra-x86_64/	(properties)
  koffice/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   54 +++++++++++++++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 23 deletions(-)


Property changes on: koffice/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /koffice/trunk:1-55626
   + /koffice/trunk:1-57824

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-11-02 14:24:50 UTC (rev 57824)
+++ extra-x86_64/PKGBUILD	2009-11-02 14:25:21 UTC (rev 57825)
@@ -12,7 +12,7 @@
 	'koffice-kplato'
 	'koffice-kplato-doc'
 	'koffice-kword'
-	'koffice-kword-doc'
+#	'koffice-kword-doc' # files missing in source tarball
 	'koffice-servicetypes'
 	'koffice-kchart'
 	'koffice-kchart-doc'
@@ -21,13 +21,13 @@
 	'koffice-libs'
 	'koffice-templates'
 	'koffice-filters'
-	'koffice-kdgantt'
+#	'koffice-kdgantt' # results in empty package
 	'koffice-krita'
 	'koffice-krita-doc'
 	'koffice-pics'
 	'koffice-tools'
 	'koffice-thesaurus-doc')
-pkgver=2.0.2
+pkgver=2.0.91
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://koffice.kde.org'
@@ -36,8 +36,8 @@
   'kdelibs' 'gsl' 'qca' 'lcms' 'glew' 'qimageblitz' 'graphicsmagick' \
   'kdepimlibs' 'pstoedit' 'wv2' 'poppler-qt' 'libwpd')
 groups=('koffice')
-source=("http://download.kde.org/stable/koffice-${pkgver}/src/koffice-${pkgver}.tar.bz2")
-md5sums=('75d812cdf59e5b0ec31dba9ac899417a')
+source=("http://download.kde.org/unstable/koffice-${pkgver}/src/koffice-${pkgver}.tar.bz2")
+md5sums=('48a102a389f2fa9a33a2ce5cb88d7baa')
 
 build() {
 	cd ${srcdir}
@@ -67,7 +67,8 @@
 
 package_koffice-kspread(){
 	pkgdesc="Spreadsheet application for KDE"
-	depends=('hicolor-icon-theme' 'gsl' 'koffice-libs')
+	depends=('hicolor-icon-theme' 'gsl' 'koffice-libs' 'koffice-templates' 'koffice-kchart')
+	optdepends=('koffice-filters: import/export filters')
 	install=koffice.install
         cd ${srcdir}/build/kspread
         make DESTDIR=${pkgdir} install
@@ -88,7 +89,8 @@
 
 package_koffice-karbon(){
 	pkgdesc="Vector drawing application for KDE"
-	depends=('hicolor-icon-theme' 'koffice-libs')
+	depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates')
+        optdepends=('koffice-filters: import/export filters')
 	install=koffice.install
         cd ${srcdir}/build/karbon
         make DESTDIR=${pkgdir} install
@@ -102,7 +104,7 @@
 
 package_koffice-kplato(){
 	pkgdesc="Project management application for KDE"
-	depends=('hicolor-icon-theme' 'koffice-libs' 'kdepimlibs')
+	depends=('hicolor-icon-theme' 'koffice-libs' 'kdepimlibs' 'koffice-templates' 'koffice-plugins')
 	install=koffice.install
         cd ${srcdir}/build/kplato
         make DESTDIR=${pkgdir} install
@@ -116,17 +118,19 @@
 
 package_koffice-kword(){
 	pkgdesc="Wordprocessor for KDE"
-	depends=('hicolor-icon-theme' 'koffice-libs')
+	depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates' 'koffice-pics' \
+		'koffice-kounavail' 'koffice-plugins')
+        optdepends=('koffice-filters: import/export filters')
 	install=koffice.install
         cd ${srcdir}/build/kword
         make DESTDIR=${pkgdir} install
 }
 
-package_koffice-kword-doc(){
-	pkgdesc="Documentation for kword"
-        cd ${srcdir}/build/doc/kword
-        make DESTDIR=${pkgdir} install
-}
+#package_koffice-kword-doc(){
+#	pkgdesc="Documentation for kword"
+#        cd ${srcdir}/build/doc/kword
+#        make DESTDIR=${pkgdir} install
+#}
 
 package_koffice-servicetypes(){
 	pkgdesc="Servicetypes for the KDE office suite"
@@ -136,7 +140,8 @@
 
 package_koffice-kchart(){
 	pkgdesc="Charting tool for KDE"
-	depends=('hicolor-icon-theme' 'koffice-interfaces')
+	depends=('hicolor-icon-theme' 'koffice-interfaces' 'koffice-templates' 'koffice-kchart')
+        optdepends=('koffice-filters: import/export filters')
 	install=koffice.install
         cd ${srcdir}/build/kchart
         make DESTDIR=${pkgdir} install
@@ -150,7 +155,8 @@
 
 package_koffice-kpresenter(){
 	pkgdesc="Presentation tool for KDE"
-	depends=('hicolor-icon-theme' 'koffice-libs')
+	depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates')
+        optdepends=('koffice-filters: import/export filters')
 	install=koffice.install
         cd ${srcdir}/build/kpresenter
         make DESTDIR=${pkgdir} install
@@ -164,7 +170,7 @@
 
 package_koffice-libs(){
 	pkgdesc="Libs for the KDE office suite"
-	depends=('kdepimlibs' 'qca' 'lcms' 'pstoedit' 'wv2' 'libwpd')
+	depends=('kdepimlibs' 'qca' 'lcms' 'pstoedit' 'wv2' 'libwpd' 'koffice-servicetypes')
         cd ${srcdir}/build/libs
         make DESTDIR=${pkgdir} install
 }
@@ -181,15 +187,17 @@
         make DESTDIR=${pkgdir} install
 }
 
-package_koffice-kdgantt(){
-	pkgdesc="Gantt for KDE"
-        cd ${srcdir}/build/kdgantt
-        make DESTDIR=${pkgdir} install
-}
+#package_koffice-kdgantt(){
+#	pkgdesc="Gantt for KDE"
+#        cd ${srcdir}/build/kdgantt
+#        make DESTDIR=${pkgdir} install
+#}
 
 package_koffice-krita(){
 	pkgdesc="Graphics editor for KDE"
-	depends=('hicolor-icon-theme' 'glew' 'qimageblitz' 'koffice-libs' 'poppler-qt' 'graphicsmagick')
+	depends=('hicolor-icon-theme' 'glew' 'qimageblitz' 'koffice-libs' \
+		'koffice-templates' 'poppler-qt' 'graphicsmagick')
+        optdepends=('koffice-filters: import/export filters')
 	install=koffice.install
         cd ${srcdir}/build/krita
         make DESTDIR=${pkgdir} install