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

[Eric Belanger]

    Date: Friday, May 30, 2008 @ 23:42:20
  Author: eric
Revision: 2301

Merged revisions 2-2300 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/gnucash/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r2295 | eric | 2008-05-30 22:30:50 -0400 (Fri, 30 May 2008) | 2 lines
  
  upgpkg: gnucash 2.2.5-1
      upstream update, depends cleanup, updated .install script to use gconfpkg, disabled SMP build
........

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

-----------------+
 PKGBUILD        |   23 +++++++++++------------
 gnucash.install |   38 +++++++++-----------------------------
 2 files changed, 20 insertions(+), 41 deletions(-)


Property changes on: gnucash/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /gnucash/trunk:1
   + /gnucash/trunk:1-2300

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-05-31 02:47:12 UTC (rev 2300)
+++ extra-i686/PKGBUILD	2008-05-31 03:42:20 UTC (rev 2301)
@@ -3,27 +3,26 @@
 # Contributor: Mark Schneider <queueRAM at gmail.com>
 
 pkgname=gnucash
-pkgver=2.2.4
+pkgver=2.2.5
 pkgrel=1
 pkgdesc="A personal and small-business financial-accounting application"
 arch=(i686 x86_64)
 url="http://www.gnucash.org"
 license=("GPL")
-depends=('gtkhtml' 'swig' 'slib' 'goffice>=0.6.2' 'libgnomeprintui' 'guile')
+depends=('gtkhtml' 'slib' 'goffice>=0.6.2' 'libgnomeprintui' 'guile' 'gconf>=2.18.0.1-4')
 makedepends=('texinfo' 'intltool')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+options=('!libtool' '!makeflags')
 install=${pkgname}.install
-md5sums=('27e660297dc5b8ce574515779d05a5a5')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('584bf4b08b48cad38b53b85dd1c753e1')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc \
-              --with-gconf-schema-file-dir=/usr/share/gconf/schemas/gnucash \
-              --disable-schemas-install
-
+  ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-  rm -rf ${startdir}/pkg/usr/share/info || return 1
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg 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
 }

Modified: extra-i686/gnucash.install
===================================================================
--- extra-i686/gnucash.install	2008-05-31 02:47:12 UTC (rev 2300)
+++ extra-i686/gnucash.install	2008-05-31 03:42:20 UTC (rev 2301)
@@ -1,37 +1,17 @@
-schemas=( \
-	'apps_gnucash_dialog_business_common.schemas' \
-	'apps_gnucash_dialog_commodities.schemas' \
-	'apps_gnucash_dialog_common.schemas' \
-	'apps_gnucash_dialog_prices.schemas' \
-	'apps_gnucash_dialog_print_checks.schemas' \
-	'apps_gnucash_dialog_reconcile.schemas' \
-	'apps_gnucash_dialog_scheduled_transctions.schemas' \
-	'apps_gnucash_dialog_totd.schemas' \
-	'apps_gnucash_general.schemas' \
-	'apps_gnucash_history.schemas' \
-	'apps_gnucash_import_generic_matcher.schemas' \
-	'apps_gnucash_warnings.schemas' \
-	'apps_gnucash_window_pages_account_tree.schemas' \
-	'apps_gnucash_window_pages_register.schemas' \
-)
+pkgname=gnucash
+
 post_install() {
-  for schema in "${schemas[@]}" ; do
-    export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` 
-    usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/gnucash/"$schema" > /dev/null
-  done
+  usr/sbin/gconfpkg --install ${pkgname}
 }
+
+pre_upgrade() {
+  pre_remove $1
+}
+
 post_upgrade() {
   post_install $1
 }
 
 pre_remove() {
-  for schema in "${schemas[@]}" ; do
-    export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` 
-    usr/bin/gconftool-2 --makefile-uninstall-rule usr/share/gconf/schemas/gnucash/"$schema" > /dev/null
-  done
+  usr/sbin/gconfpkg --uninstall ${pkgname}
 }
-
-op=$1
-shift
-
-$op $*