[arch-commits] CVS update of extra/office (4 files)
Aaron Griffin
aaron at archlinux.org
Thu Mar 27 16:59:39 UTC 2008
Date: Thursday, March 27, 2008 @ 12:59:39
Author: aaron
Path: /home/cvs-extra/extra/office
Modified: gnucash/PKGBUILD (1.2 -> 1.3) gnucash/gnucash.install (1.1 -> 1.2)
gnumeric/PKGBUILD (1.30 -> 1.31)
gnumeric/gnumeric.install (1.6 -> 1.7)
Initial commit for GNOME packaging standards.
---------------------------+
gnucash/PKGBUILD | 17 ++++++++++-------
gnucash/gnucash.install | 42 ++++++++++++++----------------------------
gnumeric/PKGBUILD | 13 ++++++++-----
gnumeric/gnumeric.install | 32 +++++++-------------------------
4 files changed, 39 insertions(+), 65 deletions(-)
Index: extra/office/gnucash/PKGBUILD
diff -u extra/office/gnucash/PKGBUILD:1.2 extra/office/gnucash/PKGBUILD:1.3
--- extra/office/gnucash/PKGBUILD:1.2 Thu Mar 27 01:14:05 2008
+++ extra/office/gnucash/PKGBUILD Thu Mar 27 12:59:39 2008
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD,v 1.2 2008/03/27 05:14:05 aaron Exp $
+# $Id: PKGBUILD,v 1.3 2008/03/27 16:59:39 aaron Exp $
# Maintainer: Aaron Griffin <aaron at archlinux.org>
# Contributor: Mark Schneider <queueRAM at gmail.com>
pkgname=gnucash
pkgver=2.2.4
-pkgrel=1
+pkgrel=2
pkgdesc="A personal and small-business financial-accounting application"
arch=(i686 x86_64)
url="http://www.gnucash.org"
@@ -19,11 +19,14 @@
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
+
+ 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
}
Index: extra/office/gnucash/gnucash.install
diff -u extra/office/gnucash/gnucash.install:1.1 extra/office/gnucash/gnucash.install:1.2
--- extra/office/gnucash/gnucash.install:1.1 Wed Jan 16 01:37:22 2008
+++ extra/office/gnucash/gnucash.install Thu Mar 27 12:59:39 2008
@@ -1,37 +1,23 @@
-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}
+ update-desktop-database -q
+}
+
+pre_upgrade() {
+ pre_remove $1
}
+
post_upgrade() {
- post_install $1
+ 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
+post_remove() {
+ update-desktop-database -q
+}
-$op $*
Index: extra/office/gnumeric/PKGBUILD
diff -u extra/office/gnumeric/PKGBUILD:1.30 extra/office/gnumeric/PKGBUILD:1.31
--- extra/office/gnumeric/PKGBUILD:1.30 Thu Mar 27 01:16:40 2008
+++ extra/office/gnumeric/PKGBUILD Thu Mar 27 12:59:39 2008
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD,v 1.30 2008/03/27 05:16:40 aaron Exp $
+# $Id: PKGBUILD,v 1.31 2008/03/27 16:59:39 aaron Exp $
# Maintainer: Aaron Griffin <aaron at archlinux.org>
# Contributor: Kritoke <typeolinux at yahoo.com>
pkgname=gnumeric
pkgver=1.8.2
-pkgrel=1
+pkgrel=2
pkgdesc="A GNOME Spreadsheet Program"
url="http://www.gnome.org/projects/gnumeric/"
arch=(i686 x86_64)
@@ -21,11 +21,14 @@
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --disable-static \
- --without-guile --with-bonobo --enable-ssindex
+ --without-guile --with-bonobo --enable-ssindex \
+ --disable-scrollkeeper
make || return 1
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
+ make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
+ DESTDIR=${startdir}/pkg install
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
+ 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
}
Index: extra/office/gnumeric/gnumeric.install
diff -u extra/office/gnumeric/gnumeric.install:1.6 extra/office/gnumeric/gnumeric.install:1.7
--- extra/office/gnumeric/gnumeric.install:1.6 Sun Aug 12 01:06:10 2007
+++ extra/office/gnumeric/gnumeric.install Thu Mar 27 12:59:39 2008
@@ -1,42 +1,24 @@
pkgname=gnumeric
-post_install() {
- export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
- usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
- scrollkeeper-update -q -p var/lib/scrollkeeper
- update-desktop-database -q
- echo "==> Install 'python' to enable python plugin support"
- echo "==> Install 'psiconv' for Psion 5 file support"
+post_install() {
+ usr/sbin/gconfpkg --install ${pkgname}
+ update-desktop-database -q
}
pre_upgrade() {
- pre_remove $1
+ pre_remove $1
}
post_upgrade() {
- post_install $1
+ post_install $1
}
pre_remove() {
- if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
- schemas=(usr/share/gconf/schemas/${pkgname}.schemas)
- elif [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
- schemas=(opt/gnome/share/gconf/schemas/${pkgname}.schemas)
- else
- schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
- fi
- export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-
- usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+ usr/sbin/gconfpkg --uninstall ${pkgname}
}
post_remove() {
- update-desktop-database -q
- scrollkeeper-update -q -p var/lib/scrollkeeper
+ update-desktop-database -q
}
-op=$1
-shift
-
-$op $*
More information about the arch-commits
mailing list