[arch-commits] Commit in gnucash/repos (3 files)

[Aaron Griffin]

    Date: Thursday, February 26, 2009 @ 18:02:32
  Author: aaron
Revision: 27850

Merged revisions 27795,27849 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/gnucash/trunk

........
  r27795 | aaron | 2009-02-25 18:23:25 -0600 (Wed, 25 Feb 2009) | 1 line
  
  upgpkg: gnucash 2.2.9-1
........
  r27849 | aaron | 2009-02-26 17:02:13 -0600 (Thu, 26 Feb 2009) | 2 lines
  
  upgpkg: gnucash 2.2.9-1
      Add optdepends and fully enable libofx
........

Modified:
  gnucash/repos/extra-i686/	(properties)
  gnucash/repos/extra-i686/PKGBUILD
  gnucash/repos/extra-i686/gnucash.install

-----------------+
 PKGBUILD        |   34 ++++++++++++++++++++--------------
 gnucash.install |    8 +++++---
 2 files changed, 25 insertions(+), 17 deletions(-)


Property changes on: gnucash/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /gnucash/trunk:1-19313
   + /gnucash/trunk:1-27849

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-02-26 23:02:13 UTC (rev 27849)
+++ extra-i686/PKGBUILD	2009-02-26 23:02:32 UTC (rev 27850)
@@ -3,29 +3,35 @@
 # Contributor: Mark Schneider <queueRAM at gmail.com>
 
 pkgname=gnucash
-pkgver=2.2.7
-pkgrel=2
+pkgver=2.2.9
+pkgrel=1
 pkgdesc="A personal and small-business financial-accounting application"
 arch=(i686 x86_64)
 url="http://www.gnucash.org"
 license=("GPL")
-depends=('gtkhtml' 'slib' 'goffice>=0.6.5' 'guile')
-makedepends=('texinfo' 'intltool' 'iso-codes') #remove iso-codes when FS#12081 is closed
-optdepends=('evince: for print preview')
+depends=('gtkhtml' 'slib' 'goffice>=0.6.5' 'guile' 'libofx' 'gconf>=2.24')
+makedepends=('texinfo' 'intltool')
+optdepends=('evince: for print preview'
+            'texinfo: for supplied info documentation'
+            'gnucash-docs: (AUR) for user documentation'
+            'perl-finance-quote: for stock information lookups'
+            'perl-date-manip: for stock information lookups')
 options=('!libtool' '!makeflags')
-install=${pkgname}.install
+install=gnucash.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('6ffb49df7b1a2a83538ccf5bb543b5ae')
+md5sums=('570eee09a1ae83c9953ec60a7fc146ed')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --mandir=/usr/share/man \
+        --sysconfdir=/etc --enable-ofx
   make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${pkgdir} install || return 1
 
-  install -d -m755 ${startdir}/pkg/usr/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1
-  rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
+  install -d -m755 ${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
 
-  rm $pkgdir/usr/share/info/dir
+  rm -f ${pkgdir}/usr/share/info/dir
+  gzip -9 ${pkgdir}/usr/share/info/*
 }

Modified: extra-i686/gnucash.install
===================================================================
--- extra-i686/gnucash.install	2009-02-26 23:02:13 UTC (rev 27849)
+++ extra-i686/gnucash.install	2009-02-26 23:02:32 UTC (rev 27850)
@@ -1,16 +1,17 @@
 pkgname=gnucash
 info_dir=/usr/share/info
-info_files=(gnucash-design)
+info_files=(gnucash-design.info)
 
 post_install() {
   usr/sbin/gconfpkg --install ${pkgname}
+  [ -x usr/bin/install-info ] || return 0
   for f in ${info_files[@]}; do
     usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
   done
 }
 
 pre_upgrade() {
-    pre_remove $1
+  pre_remove $1
 }
 
 post_upgrade() {
@@ -19,7 +20,8 @@
 
 pre_remove() {
   usr/sbin/gconfpkg --uninstall ${pkgname}
+  [ -x usr/bin/install-info ] || return 0
   for f in ${info_files[@]}; do
-    /usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+    usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
   done
 }