[arch-commits] Commit in gnumeric/repos (4 files)

[Eric Bélanger]

    Date: Monday, January 19, 2009 @ 01:21:33
  Author: eric
Revision: 24653

Merged revisions 24603,24652 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/gnumeric/trunk

........
  r24603 | eric | 2009-01-18 23:50:19 -0500 (Sun, 18 Jan 2009) | 2 lines
  
  upgpkg: gnumeric 1.8.4-1
      Upstream update, Replaced post-install messages by optdepends, Added intltool and gnome-doc-utils makedepends, Added ChangeLog
........
  r24652 | eric | 2009-01-19 01:21:09 -0500 (Mon, 19 Jan 2009) | 1 line
  
  upgpkg: gnumeric 1.8.4-1
........

Added:
  gnumeric/repos/extra-i686/ChangeLog
    (from rev 24652, gnumeric/trunk/ChangeLog)
Modified:
  gnumeric/repos/extra-i686/	(properties)
  gnumeric/repos/extra-i686/PKGBUILD
  gnumeric/repos/extra-i686/gnumeric.install

------------------+
 ChangeLog        |    7 +++++++
 PKGBUILD         |   24 +++++++++++++-----------
 gnumeric.install |    3 ---
 3 files changed, 20 insertions(+), 14 deletions(-)


Property changes on: gnumeric/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /gnumeric/trunk:1-2301
   + /gnumeric/trunk:1-24652

Copied: gnumeric/repos/extra-i686/ChangeLog (from rev 24652, gnumeric/trunk/ChangeLog)
===================================================================
--- extra-i686/ChangeLog	                        (rev 0)
+++ extra-i686/ChangeLog	2009-01-19 06:21:33 UTC (rev 24653)
@@ -0,0 +1,7 @@
+2009-01-18  Eric Belanger  <eric at archlinux.org>
+
+	* gnumeric 1.8.4-1
+	* Upstream update
+	* Replaced post-install messages by optdepends
+	* Added intltool and gnome-doc-utils makedepends
+	* Added ChangeLog

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-01-19 06:21:09 UTC (rev 24652)
+++ extra-i686/PKGBUILD	2009-01-19 06:21:33 UTC (rev 24653)
@@ -1,31 +1,33 @@
 # $Id$
-# Maintainer: Aaron Griffin <aaron at archlinux.org>
+# Maintainer: Eric Belanger <eric at archlinux.org>
 # Contributor: Kritoke <typeolinux at yahoo.com>
 
 pkgname=gnumeric
-pkgver=1.8.3
+pkgver=1.8.4
 pkgrel=1
 pkgdesc="A GNOME Spreadsheet Program"
+arch=('i686' 'x86_64')
 url="http://www.gnome.org/projects/gnumeric/"
-arch=(i686 x86_64)
 license=('GPL')
 depends=('goffice>=0.6.1' 'gconf>=2.18.0.1-4' 'desktop-file-utils')
-makedepends=('perlxml' 'pygtk' 'psiconv' 'pkgconfig')
+makedepends=('perlxml' 'pygtk' 'psiconv' 'pkgconfig' 'intltool' 'gnome-doc-utils>=0.14.1')
+optdepends=('python: for python plugin support' 'psiconv: for Psion 5 file support')
 install=gnumeric.install
 options=('libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('3ce6ba6483ccd6fe9974cface582337a')
+md5sums=('338f0084f04a16f78797ad01f85d3251')
+sha1sums=('2d765b0d06509e0695c4d3ec96b94f8acba88735')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}
 
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static \
-              --without-guile --with-bonobo --enable-ssindex
+              --without-guile --with-bonobo --enable-ssindex || return 1
   make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${pkgdir} install || return 1
 
-  mkdir -p ${startdir}/pkg/usr/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas
-  rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
+  install -d ${pkgdir}/usr/share/gconf/schemas
+  gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }

Modified: extra-i686/gnumeric.install
===================================================================
--- extra-i686/gnumeric.install	2009-01-19 06:21:09 UTC (rev 24652)
+++ extra-i686/gnumeric.install	2009-01-19 06:21:33 UTC (rev 24653)
@@ -3,9 +3,6 @@
 post_install() {
   usr/sbin/gconfpkg --install ${pkgname}
   update-desktop-database -q
-
-  echo "==> Install 'python' to enable python plugin support"
-  echo "==> Install 'psiconv' for Psion 5 file support"
 }
 
 pre_upgrade() {