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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 11:38:07
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-pilot

Modified: PKGBUILD (1.15 -> 1.16) gnome-pilot.install (1.5 -> 1.6)

upgpkg: gnome-pilot 2.0.15-2
Move to /usr


---------------------+
 PKGBUILD            |   26 ++++++++++++++------------
 gnome-pilot.install |   14 +++++++-------
 2 files changed, 21 insertions(+), 19 deletions(-)


Index: extra/gnome/gnome-pilot/PKGBUILD
diff -u extra/gnome/gnome-pilot/PKGBUILD:1.15 extra/gnome/gnome-pilot/PKGBUILD:1.16
--- extra/gnome/gnome-pilot/PKGBUILD:1.15	Tue Dec 26 07:06:59 2006
+++ extra/gnome/gnome-pilot/PKGBUILD	Sun Apr 22 11:38:07 2007
@@ -1,12 +1,14 @@
-# $Id: PKGBUILD,v 1.15 2006/12/26 12:06:59 arjan Exp $
-# Maintainer: arjan Timmerman <arjan at soulfly.nl>
+# $Id: PKGBUILD,v 1.16 2007/04/22 15:38:07 jgc Exp $
+# Jan de Groot <jgc at archlinux.org>
+
 pkgname=gnome-pilot
 pkgver=2.0.15
-pkgrel=1
+pkgrel=2
 pkgdesc="Pilot Support for Gnome"
 arch=(i686 x86_64)
-depends=('gnome-panel>=2.16.0' 'pilot-link>=0.12.1')
-makedepends=('pkgconfig' 'intltool' 'gob2')
+license=('GPL')
+depends=('gnome-panel>=2.18.1' 'pilot-link>=0.12.1' 'scrollkeeper')
+makedepends=('pkgconfig' 'perlxml' 'gob2')
 options=('nolibtool')
 url="http://www.gnome.org"
 install=gnome-pilot.install
@@ -14,19 +16,19 @@
 md5sums=('460a1fdd2206e1bbf820639831ca88f8')
 
 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
+    find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
     sed -i -e 's/-scrollkeeper-update.*//' omf.make
   fi
 
-  ./configure --prefix=/opt/gnome
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --libexecdir=/usr/lib/gnome-pilot \
+              --localstatedir=/var --disable-static
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
 
-  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/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/gnome-pilot/gnome-pilot.install
diff -u extra/gnome/gnome-pilot/gnome-pilot.install:1.5 extra/gnome/gnome-pilot/gnome-pilot.install:1.6
--- extra/gnome/gnome-pilot/gnome-pilot.install:1.5	Fri Sep 29 11:45:29 2006
+++ extra/gnome/gnome-pilot/gnome-pilot.install	Sun Apr 22 11:38:07 2007
@@ -1,10 +1,9 @@
 pkgname=gnome-pilot
 
 post_install() {
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-  opt/gnome/bin/gconftool-2 --makefile-install-rule opt/gnome/share/gconf/schemas/${pkgname}.schemas >/dev/null
+  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
 }
 
 pre_upgrade() {
@@ -16,18 +15,19 @@
 }
 
 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`
+  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
   
-  opt/gnome/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
 }
 
 post_remove() {
-  update-desktop-database -q
   scrollkeeper-update -q -p var/lib/scrollkeeper
 }