[arch-commits] CVS update of extra/games/gtetrinet (PKGBUILD gtetrinet.install)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 16:19:55
  Author: jgc
    Path: /home/cvs-extra/extra/games/gtetrinet

Modified: PKGBUILD (1.14 -> 1.15) gtetrinet.install (1.2 -> 1.3)

upgpkg: gtetrinet 0.7.11-2
Move to /usr


-------------------+
 PKGBUILD          |   18 +++++++++---------
 gtetrinet.install |   12 +++++++-----
 2 files changed, 16 insertions(+), 14 deletions(-)


Index: extra/games/gtetrinet/PKGBUILD
diff -u extra/games/gtetrinet/PKGBUILD:1.14 extra/games/gtetrinet/PKGBUILD:1.15
--- extra/games/gtetrinet/PKGBUILD:1.14	Sun Dec 31 11:38:26 2006
+++ extra/games/gtetrinet/PKGBUILD	Sun Apr 22 16:19:54 2007
@@ -1,27 +1,27 @@
-# $Id: PKGBUILD,v 1.14 2006/12/31 16:38:26 jgc Exp $
+# $Id: PKGBUILD,v 1.15 2007/04/22 20:19:54 jgc Exp $
 # Maintainer: dale <dale at archlinux.org>
 
 pkgname=gtetrinet
 pkgver=0.7.11
-pkgrel=1
+pkgrel=2
 pkgdesc="A clone of the game Tetrinet for the gnome environment."
 arch=(i686 x86_64)
-depends=('libgnomeui>=2.16.0')
-makedepends=('intltool')
+license=('GPL')
+depends=('libgnomeui>=2.18.1-2')
+makedepends=('perlxml' 'pkgconfig')
 install=gtetrinet.install
 url="http://gtetrinet.sourceforge.net/"
 source=(http://ftp.gnome.org/pub/GNOME/sources/gtetrinet/0.7/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('7d113e49506e44b836ce6f259fd3ad88')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
   cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/opt/gnome
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   sed -i -e 's/games$/bin/g' src/Makefile || return 1
   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/games/gtetrinet/gtetrinet.install
diff -u extra/games/gtetrinet/gtetrinet.install:1.2 extra/games/gtetrinet/gtetrinet.install:1.3
--- extra/games/gtetrinet/gtetrinet.install:1.2	Sun Dec 31 11:38:26 2006
+++ extra/games/gtetrinet/gtetrinet.install	Sun Apr 22 16:19:55 2007
@@ -1,8 +1,8 @@
 pkgname=gtetrinet
 
 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
   update-desktop-database -q
 }
 
@@ -15,14 +15,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() {