[arch-commits] CVS update of extra/gnome/tomboy (PKGBUILD tomboy.install)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 11:59:05
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/tomboy

Modified: PKGBUILD (1.2 -> 1.3) tomboy.install (1.1 -> 1.2)

upgpkg: tomboy 0.6.3-1
Move to /usr


----------------+
 PKGBUILD       |   29 ++++++++++++-----------------
 tomboy.install |   18 +++++++-----------
 2 files changed, 19 insertions(+), 28 deletions(-)


Index: extra/gnome/tomboy/PKGBUILD
diff -u extra/gnome/tomboy/PKGBUILD:1.2 extra/gnome/tomboy/PKGBUILD:1.3
--- extra/gnome/tomboy/PKGBUILD:1.2	Tue Mar 27 11:45:03 2007
+++ extra/gnome/tomboy/PKGBUILD	Sun Apr 22 11:59:05 2007
@@ -1,37 +1,32 @@
-# $Id: PKGBUILD,v 1.2 2007/03/27 15:45:03 jgc Exp $
+# $Id: PKGBUILD,v 1.3 2007/04/22 15:59:05 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=tomboy
-pkgver=0.6.1
-pkgrel=2
+pkgver=0.6.3
+pkgrel=1
 pkgdesc="Desktop note-taking application for Linux and Unix"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.gnome.org/projects/tomboy/"
-depends=('gnome-sharp' 'libgnomeprintui' 'gtkspell' 'dbus' 'gmime')
-makedepends=('perlxml' 'pkgconfig' 'gnome-panel')
+depends=('gnome-sharp' 'libgnomeprintui>=2.18.0' 'gtkspell' 'gmime' 'scrollkeeper')
+makedepends=('perlxml' 'pkgconfig' 'gnome-panel>=2.18.1')
 options=('nolibtool')
+groups=('gnome-extra')
 install=tomboy.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.6/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('33e7f6b465055bcc72d6997b5f2a3199')
+md5sums=('ebf93b189c7db91037e351c1f7c33ba3')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
-
   export MONO_SHARED_DIR=${startdir}/src/.wabi
   mkdir -p "${MONO_SHARED_DIR}"
  
   cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/opt/gnome --disable-scrollkeeper
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var --disable-scrollkeeper
   make || return 1
   make DESTDIR=${startdir}/pkg GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
 
-  rm -rf "${MONO_SHARED_DIR}"
-
-  mkdir -p ${startdir}/pkg/opt/gnome/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/opt/gnome/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/opt/gnome/etc/gconf/schemas/*.schemas
-  rm -f ${startdir}/pkg/opt/gnome/etc/gconf/schemas/*.schemas
-  
-  mkdir -p ${startdir}/pkg/usr/share
-  mv ${startdir}/pkg/opt/gnome/share/icons ${startdir}/pkg/usr/share/
+  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/gnome/tomboy/tomboy.install
diff -u extra/gnome/tomboy/tomboy.install:1.1 extra/gnome/tomboy/tomboy.install:1.2
--- extra/gnome/tomboy/tomboy.install:1.1	Thu Mar 22 14:05:50 2007
+++ extra/gnome/tomboy/tomboy.install	Sun Apr 22 11:59:05 2007
@@ -1,12 +1,9 @@
 pkgname=tomboy
 
 post_install() {
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
+  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
 
-  opt/gnome/bin/gconftool-2 --makefile-install-rule opt/gnome/share/gconf/schemas/${pkgname}.schemas >/dev/null
-
-  opt/gnome/bin/gconftool-2 --config-source="${GCONF_CONFIG_SOURCE}" --direct --load \
-	opt/gnome/etc/gconf/schemas/panel-default-setup.entries >/dev/null
+  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
 
   scrollkeeper-update -q -p var/lib/scrollkeeper
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
@@ -21,18 +18,17 @@
 }
 
 pre_remove() {
-  if [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
+  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=`opt/gnome/bin/gconftool-2 --get-default-source`
-
-  opt/gnome/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
 
-  opt/gnome/bin/gconftool-2 --config-source="${GCONF_CONFIG_SOURCE}" --direct --unload \
-	opt/gnome/etc/gconf/schemas/panel-default-setup.entries >/dev/null
+  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
 }
 
 post_remove() {