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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 11:50:40
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-utils

Modified: PKGBUILD (1.28 -> 1.29) gnome-utils.install (1.8 -> 1.9)

upgpkg: gnome-utils 2.18.1-1
Move to /usr


---------------------+
 PKGBUILD            |   31 +++++++++++++------------------
 gnome-utils.install |   14 +++++++-------
 2 files changed, 20 insertions(+), 25 deletions(-)


Index: extra/gnome/gnome-utils/PKGBUILD
diff -u extra/gnome/gnome-utils/PKGBUILD:1.28 extra/gnome/gnome-utils/PKGBUILD:1.29
--- extra/gnome/gnome-utils/PKGBUILD:1.28	Wed Mar 21 14:40:52 2007
+++ extra/gnome/gnome-utils/PKGBUILD	Sun Apr 22 11:50:40 2007
@@ -1,36 +1,31 @@
-# $Id: PKGBUILD,v 1.28 2007/03/21 18:40:52 jgc Exp $
+# $Id: PKGBUILD,v 1.29 2007/04/22 15:50:40 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-utils
-pkgver=2.18.0
+pkgver=2.18.1
 pkgrel=1
 pkgdesc="Common utilities for GNOME"
 arch=(i686 x86_64)
-depends=('libgtop>=2.14.8' 'libgnomeprintui>=2.18.0' 'gnome-panel>=2.18.0')
-makedepends=('perlxml' 'gnome-doc-utils' 'pkgconfig' 'gtk-doc')
+license=('GPL')
+depends=('libgtop>=2.14.8-2' 'libgnomeprintui>=2.18.0' 'gnome-panel>=2.18.1' 'scrollkeeper')
+makedepends=('perlxml' 'gnome-doc-utils>=0.10.3' 'pkgconfig' 'gtk-doc')
 options=('nolibtool')
 url="http://www.gnome.org"
 groups=('gnome-extra')
-license=(GPL)
 install=gnome-utils.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('33fad81655eed993dea8b5bb7a5789bb')
+md5sums=('10e8bd928d099a0d1f70919c8b7b7784')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
-
   cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/opt/gnome \
-    --enable-hal \
-    --disable-scrollkeeper \
-    --disable-static
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --libexecdir=/usr/lib/gnome-utils \
+              --localstatedir=/var --disable-static \
+              --enable-hal --disable-scrollkeeper
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
-  rm -rf ${startdir}/pkg/opt/gnome/share/gtk-doc
-  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/gnome-utils/gnome-utils.install
diff -u extra/gnome/gnome-utils/gnome-utils.install:1.8 extra/gnome/gnome-utils/gnome-utils.install:1.9
--- extra/gnome/gnome-utils/gnome-utils.install:1.8	Wed Mar 21 14:40:52 2007
+++ extra/gnome/gnome-utils/gnome-utils.install	Sun Apr 22 11:50:40 2007
@@ -1,10 +1,9 @@
 pkgname=gnome-utils
 
 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
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
@@ -17,18 +16,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
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }