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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 12:25:25
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/file-roller

Modified: PKGBUILD (1.39 -> 1.40) file-roller.install (1.8 -> 1.9)

upgpkg: file-roller 2.18.2-1
Move to /usr


---------------------+
 PKGBUILD            |   28 +++++++++++++---------------
 file-roller.install |   12 +++++++-----
 2 files changed, 20 insertions(+), 20 deletions(-)


Index: extra/gnome/file-roller/PKGBUILD
diff -u extra/gnome/file-roller/PKGBUILD:1.39 extra/gnome/file-roller/PKGBUILD:1.40
--- extra/gnome/file-roller/PKGBUILD:1.39	Mon Apr  9 16:45:00 2007
+++ extra/gnome/file-roller/PKGBUILD	Sun Apr 22 12:25:25 2007
@@ -1,33 +1,31 @@
-# $Id: PKGBUILD,v 1.39 2007/04/09 20:45:00 jgc Exp $
+# $Id: PKGBUILD,v 1.40 2007/04/22 16:25:25 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=file-roller
-pkgver=2.18.1
+pkgver=2.18.2
 pkgrel=1
 pkgdesc="Archive manipulator for GNOME2"
 arch=(i686 x86_64)
-depends=('nautilus>=2.18.0')
-makedepends=('perlxml' 'gnome-doc-utils' 'pkgconfig')
+license=('GPL')
+depends=('libgnomeui>=2.18.1-2' 'scrollkeeper' 'desktop-file-utils')
+makedepends=('perlxml' 'gnome-doc-utils>=0.10.3' 'pkgconfig' 'nautilus>=2.18.1')
 groups=('gnome-extra')
-license=(GPL)
 options=('nolibtool')
 install=file-roller.install
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('8cbd7292146da7d6fe3a586c77263079')
+md5sums=('fa5837a2d0e3c62b85201deef4202923')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
-
   cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/opt/gnome --disable-scrollkeeper --disable-static
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --libexecdir=/usr/lib/file-roller \
+              --localstatedir=/var --disable-static \
+	      --disable-scrollkeeper
   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
-  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/file-roller/file-roller.install
diff -u extra/gnome/file-roller/file-roller.install:1.8 extra/gnome/file-roller/file-roller.install:1.9
--- extra/gnome/file-roller/file-roller.install:1.8	Thu Feb  1 17:31:42 2007
+++ extra/gnome/file-roller/file-roller.install	Sun Apr 22 12:25:25 2007
@@ -1,8 +1,8 @@
 pkgname=file-roller
 
 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,14 +17,16 @@
 }
 
 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() {