[arch-commits] CVS update of extra/office/gnumeric (3 files)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 14:08:43
  Author: jgc
    Path: /home/cvs-extra/extra/office/gnumeric

Modified: PKGBUILD (1.24 -> 1.25) gnumeric.install (1.4 -> 1.5)
          help-file.patch (1.1 -> 1.2)

upgpkg: gnumeric 1.6.3-4
Move to /usr


------------------+
 PKGBUILD         |   28 +++++++++++++++++-----------
 gnumeric.install |   40 ++++++++++++++--------------------------
 help-file.patch  |    2 +-
 3 files changed, 32 insertions(+), 38 deletions(-)


Index: extra/office/gnumeric/PKGBUILD
diff -u extra/office/gnumeric/PKGBUILD:1.24 extra/office/gnumeric/PKGBUILD:1.25
--- extra/office/gnumeric/PKGBUILD:1.24	Fri Mar 30 06:17:01 2007
+++ extra/office/gnumeric/PKGBUILD	Sun Apr 22 14:08:43 2007
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD,v 1.24 2007/03/30 10:17:01 tom Exp $
-# Maintainer: arjan <arjan at archlinux.org>
+# $Id: PKGBUILD,v 1.25 2007/04/22 18:08:43 jgc Exp $
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Kritoke <typeolinux at yahoo.com>
 
 pkgname=gnumeric
 pkgver=1.6.3
-pkgrel=3
+pkgrel=4
 pkgdesc="A GNOME Spreadsheet Program"
 arch=(i686 x86_64)
-depends=('libgnomeprintui' 'goffice>=0.2.1-2' 'libbonoboui')
-makedepends=('intltool' 'pygtk' 'psiconv' 'pkgconfig')
-options=(NOLIBTOOL)
+depends=('libgnomeprintui>=2.18.0' 'goffice>=0.2.2-2' 'libbonoboui>=2.18.0-2')
+makedepends=('perlxml' 'pygtk' 'psiconv' 'pkgconfig')
+options=('nolibtool')
 url="http://www.gnome.org/projects/gnumeric/"
 license=('GPL')
 install=gnumeric.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.6/${pkgname}-${pkgver}.tar.bz2 help-file.patch)
-md5sums=('78ffd75ae6abc3bb20dd04407a082a26' 'f758830d972dbdd02290e7e3ae843e15')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.6/${pkgname}-${pkgver}.tar.bz2
+        help-file.patch)
+md5sums=('78ffd75ae6abc3bb20dd04407a082a26' '378d89a53924e496bb425690a73bde9b')
 
 build() {
-  [ -z ${GNOMEDIR} ] && . /etc/profile.d/gnome.sh
   cd ${startdir}/src/${pkgname}-${pkgver}
   find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
   if [ -f omf.make ]; then
@@ -26,8 +26,14 @@
   find plugins -name 'plugin.xml.in' -exec sed -i -e 's/\.la/.so/g' {} \;
   rm -f GNOME_Gnumeric.server.in
 
-  patch -Np1 -i ../help-file.patch || return 1
-  ./configure --prefix=/opt/gnome --without-guile --with-bonobo --enable-ssindex
+  patch -Np1 -i ${startdir}/src/help-file.patch || return 1
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var --disable-static \
+	      --without-guile --with-bonobo --enable-ssindex
   make || return 1
   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
+  rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
 }
Index: extra/office/gnumeric/gnumeric.install
diff -u extra/office/gnumeric/gnumeric.install:1.4 extra/office/gnumeric/gnumeric.install:1.5
--- extra/office/gnumeric/gnumeric.install:1.4	Thu Mar 17 02:55:59 2005
+++ extra/office/gnumeric/gnumeric.install	Sun Apr 22 14:08:43 2007
@@ -1,19 +1,9 @@
 pkgname=gnumeric
 
 post_install() {
-  schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
-  scrolls=(`pacman -Ql $pkgname | grep 'share/omf/.*\.omf$' | awk '{ print $2 }'`)
-
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-  for schema in "${schemas[@]}" ; do
-    opt/gnome/bin/gconftool-2 --makefile-install-rule "$schema" >/dev/null 2>&1
-  done
-
-  for scroll in "${scrolls[@]}" ; do
-    scrollkeeper-install -q -p var/lib/scrollkeeper "$scroll"
-  done
-
-  kill -s HUP `pidof /opt/gnome/bin/gconfd-2` > /dev/null 2>&1
+  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
 }
 
@@ -26,23 +16,21 @@
 }
 
 pre_remove() {
-  schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
-  scrolls=(`pacman -Ql $pkgname | grep 'share/omf/.*\.omf$' | awk '{ print $2 }'`)
-
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-  for schema in "${schemas[@]}" ; do
-    opt/gnome/bin/gconftool-2 --makefile-uninstall-rule "$schema" >/dev/null 2>&1
-  done
-
-  for scroll in "${scrolls[@]}" ; do
-    scrollkeeper-uninstall -q -p var/lib/scrollkeeper "$scroll"
-  done
-
-  kill -s HUP `pidof /opt/gnome/bin/gconfd-2` >/dev/null 2>&1
+  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
 }
 
 post_remove() {
   update-desktop-database -q
+  scrollkeeper-update -q -p var/lib/scrollkeeper
 }
 
 op=$1
Index: extra/office/gnumeric/help-file.patch
diff -u extra/office/gnumeric/help-file.patch:1.1 extra/office/gnumeric/help-file.patch:1.2
--- extra/office/gnumeric/help-file.patch:1.1	Fri Jan 13 15:00:52 2006
+++ extra/office/gnumeric/help-file.patch	Sun Apr 22 14:08:43 2007
@@ -8,7 +8,7 @@
 -			"gnumeric.xml", NULL);
 +	/*argv[1] = g_build_filename (gnm_sys_data_dir (), "doc", "C",
 +			"gnumeric.xml", NULL);*/
-+	argv[1] = ("/opt/gnome/share/gnome/help/gnumeric/C/gnumeric.xml");
++	argv[1] = ("/usr/share/gnome/help/gnumeric/C/gnumeric.xml");
 +	
  #else
  	argv[0] = (char *)"hh";