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

Jan de Groot jgc at archlinux.org
Sun Apr 22 16:05:57 EDT 2007


    Date: Sunday, April 22, 2007 @ 16:05:57
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-games

Modified: PKGBUILD (1.40 -> 1.41) gnome-games.install (1.13 -> 1.14)

upgpkg: gnome-games 2.18.1-1
Move to /usr, use the games group, migrate scores on upgrade


---------------------+
 PKGBUILD            |   44 +++++-----
 gnome-games.install |  206 ++++++++++++++++++++++++--------------------------
 2 files changed, 124 insertions(+), 126 deletions(-)


Index: extra/gnome/gnome-games/PKGBUILD
diff -u extra/gnome/gnome-games/PKGBUILD:1.40 extra/gnome/gnome-games/PKGBUILD:1.41
--- extra/gnome/gnome-games/PKGBUILD:1.40	Fri Feb  2 13:27:20 2007
+++ extra/gnome/gnome-games/PKGBUILD	Sun Apr 22 16:05:57 2007
@@ -1,40 +1,40 @@
-# $Id: PKGBUILD,v 1.40 2007/02/02 18:27:20 jgc Exp $
+# $Id: PKGBUILD,v 1.41 2007/04/22 20:05:57 jgc Exp $
 # Maintainer: arjan <arjan at archlinux.org>
 
 pkgname=gnome-games
-pkgver=2.16.3
+pkgver=2.18.1
 pkgrel=1
 pkgdesc="Some Games for GNOME"
 arch=(i686 x86_64)
-depends=('libgnomeui>=2.16.0' 'guile>=1.8.1' 'librsvg>=2.16.1')
-makedepends=('perlxml' 'pkgconfig')
+license=('GPL')
+depends=('libgnomeui>=2.18.1-2' 'guile>=1.8.1' 'librsvg>=2.16.1' 'filesystem>=0.8-3' 'scrollkeeper' 'desktop-file-utils' 'gnome-python-desktop>=2.18.0')
+makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.10.3')
+provides=('glchess' 'gnome-sudoku')
+conflicts=('glchess' 'gnome-sudoku')
 install=gnome-games.install
 url="http://www.gnome.org"
 groups=('gnome-extra')
-license=(GPL)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.16/${pkgname}-${pkgver}.tar.bz2 )
-md5sums=('88baa9ab64b84bfcac2a1ba05f84d2f9')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2 )
+md5sums=('b5479669347042c6354e5c0d2d9df2a0')
 
 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
-    sed -i -e 's/-scrollkeeper-update.*//' omf.make
-  fi
-
-  ./configure --prefix=/opt/gnome
+  #find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
+  #if [ -f omf.make ]; then
+  #  sed -i -e 's/-scrollkeeper-update.*//' omf.make
+  #fi
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var --disable-scrollkeeper \
+              --with-scores-user=root --with-scores-group=games
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
 
-  #remove score files, we touch them on postinstall
-  rm -rf ${startdir}/pkg/opt/gnome/var
-
-  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
+  # Remove all scores, we generate them from postinstall
+  rm -rf ${startdir}/pkg/var
 
-  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-games/gnome-games.install
diff -u extra/gnome/gnome-games/gnome-games.install:1.13 extra/gnome/gnome-games/gnome-games.install:1.14
--- extra/gnome/gnome-games/gnome-games.install:1.13	Sun Oct 15 05:58:03 2006
+++ extra/gnome/gnome-games/gnome-games.install	Sun Apr 22 16:05:57 2007
@@ -1,112 +1,111 @@
 pkgname=gnome-games
 
-scores=(
-  'opt/gnome/var/games/glines.scores'
-  'opt/gnome/var/games/gnibbles.1.0.scores'
-  'opt/gnome/var/games/gnibbles.1.1.scores'
-  'opt/gnome/var/games/gnibbles.2.0.scores'
-  'opt/gnome/var/games/gnibbles.2.1.scores'
-  'opt/gnome/var/games/gnibbles.3.0.scores'
-  'opt/gnome/var/games/gnibbles.3.1.scores'
-  'opt/gnome/var/games/gnibbles.4.0.scores'
-  'opt/gnome/var/games/gnibbles.4.1.scores'
-  'opt/gnome/var/games/gnobots2.classic_robots-safe.scores'
-  'opt/gnome/var/games/gnobots2.classic_robots-super-safe.scores'
-  'opt/gnome/var/games/gnobots2.classic_robots.scores'
-  'opt/gnome/var/games/gnobots2.nightmare-safe.scores'
-  'opt/gnome/var/games/gnobots2.nightmare-super-safe.scores'
-  'opt/gnome/var/games/gnobots2.nightmare.scores'
-  'opt/gnome/var/games/gnobots2.robots2-safe.scores'
-  'opt/gnome/var/games/gnobots2.robots2-super-safe.scores'
-  'opt/gnome/var/games/gnobots2.robots2.scores'
-  'opt/gnome/var/games/gnobots2.robots2_easy-safe.scores'
-  'opt/gnome/var/games/gnobots2.robots2_easy-super-safe.scores'
-  'opt/gnome/var/games/gnobots2.robots2_easy.scores'
-  'opt/gnome/var/games/gnobots2.robots_with_safe_teleport-safe.scores'
-  'opt/gnome/var/games/gnobots2.robots_with_safe_teleport-super-safe.scores'
-  'opt/gnome/var/games/gnobots2.robots_with_safe_teleport.scores'
-  'opt/gnome/var/games/gnome-stones.scores'
-  'opt/gnome/var/games/gnometris.scores'
-  'opt/gnome/var/games/gnomine.Custom.scores'
-  'opt/gnome/var/games/gnomine.Large.scores'
-  'opt/gnome/var/games/gnomine.Medium.scores'
-  'opt/gnome/var/games/gnomine.Small.scores'
-  'opt/gnome/var/games/gnotravex.2x2.scores'
-  'opt/gnome/var/games/gnotravex.3x3.scores'
-  'opt/gnome/var/games/gnotravex.4x4.scores'
-  'opt/gnome/var/games/gnotravex.5x5.scores'
-  'opt/gnome/var/games/gnotravex.6x6.scores'
-  'opt/gnome/var/games/gnotski.1.scores'
-  'opt/gnome/var/games/gnotski.10.scores'
-  'opt/gnome/var/games/gnotski.11.scores'
-  'opt/gnome/var/games/gnotski.12.scores'
-  'opt/gnome/var/games/gnotski.13.scores'
-  'opt/gnome/var/games/gnotski.14.scores'
-  'opt/gnome/var/games/gnotski.15.scores'
-  'opt/gnome/var/games/gnotski.16.scores'
-  'opt/gnome/var/games/gnotski.17.scores'
-  'opt/gnome/var/games/gnotski.18.scores'
-  'opt/gnome/var/games/gnotski.19.scores'
-  'opt/gnome/var/games/gnotski.2.scores'
-  'opt/gnome/var/games/gnotski.20.scores'
-  'opt/gnome/var/games/gnotski.21.scores'
-  'opt/gnome/var/games/gnotski.22.scores'
-  'opt/gnome/var/games/gnotski.23.scores'
-  'opt/gnome/var/games/gnotski.24.scores'
-  'opt/gnome/var/games/gnotski.25.scores'
-  'opt/gnome/var/games/gnotski.26.scores'
-  'opt/gnome/var/games/gnotski.27.scores'
-  'opt/gnome/var/games/gnotski.28.scores'
-  'opt/gnome/var/games/gnotski.29.scores'
-  'opt/gnome/var/games/gnotski.3.scores'
-  'opt/gnome/var/games/gnotski.30.scores'
-  'opt/gnome/var/games/gnotski.31.scores'
-  'opt/gnome/var/games/gnotski.32.scores'
-  'opt/gnome/var/games/gnotski.33.scores'
-  'opt/gnome/var/games/gnotski.34.scores'
-  'opt/gnome/var/games/gnotski.35.scores'
-  'opt/gnome/var/games/gnotski.36.scores'
-  'opt/gnome/var/games/gnotski.37.scores'
-  'opt/gnome/var/games/gnotski.4.scores'
-  'opt/gnome/var/games/gnotski.5.scores'
-  'opt/gnome/var/games/gnotski.6.scores'
-  'opt/gnome/var/games/gnotski.7.scores'
-  'opt/gnome/var/games/gnotski.8.scores'
-  'opt/gnome/var/games/gnotski.9.scores'
-  'opt/gnome/var/games/gtali.scores'
-  'opt/gnome/var/games/mahjongg.bridges.scores'
-  'opt/gnome/var/games/mahjongg.cloud.scores'
-  'opt/gnome/var/games/mahjongg.confounding.scores'
-  'opt/gnome/var/games/mahjongg.difficult.scores'
-  'opt/gnome/var/games/mahjongg.dragon.scores'
-  'opt/gnome/var/games/mahjongg.easy.scores'
-  'opt/gnome/var/games/mahjongg.pyramid.scores'
-  'opt/gnome/var/games/mahjongg.tictactoe.scores'
-  'opt/gnome/var/games/mahjongg.ziggurat.scores'
-  'opt/gnome/var/games/same-gnome.Large.scores'
-  'opt/gnome/var/games/same-gnome.Medium.scores'
-  'opt/gnome/var/games/same-gnome.Small.scores'
-)
+scores=(glines.Large.scores
+	glines.Medium.scores
+	glines.Small.scores
+	gnibbles.1.0.scores
+	gnibbles.1.1.scores
+	gnibbles.2.0.scores
+	gnibbles.2.1.scores
+	gnibbles.3.0.scores
+	gnibbles.3.1.scores
+	gnibbles.4.0.scores
+	gnibbles.4.1.scores
+	gnobots2.classic_robots-safe.scores
+	gnobots2.classic_robots-super-safe.scores
+	gnobots2.classic_robots.scores
+	gnobots2.nightmare-safe.scores
+	gnobots2.nightmare-super-safe.scores
+	gnobots2.nightmare.scores
+	gnobots2.robots2-safe.scores
+	gnobots2.robots2-super-safe.scores
+	gnobots2.robots2.scores
+	gnobots2.robots2_easy-safe.scores
+	gnobots2.robots2_easy-super-safe.scores
+	gnobots2.robots2_easy.scores
+	gnobots2.robots_with_safe_teleport-safe.scores
+	gnobots2.robots_with_safe_teleport-super-safe.scores
+	gnobots2.robots_with_safe_teleport.scores
+	gnometris.scores
+	gnomine.Custom.scores
+	gnomine.Large.scores
+	gnomine.Medium.scores
+	gnomine.Small.scores
+	gnotravex.2x2.scores
+	gnotravex.3x3.scores
+	gnotravex.4x4.scores
+	gnotravex.5x5.scores
+	gnotravex.6x6.scores
+	gnotski.1.scores
+	gnotski.10.scores
+	gnotski.11.scores
+	gnotski.12.scores
+	gnotski.13.scores
+	gnotski.14.scores
+	gnotski.15.scores
+	gnotski.16.scores
+	gnotski.17.scores
+	gnotski.18.scores
+	gnotski.19.scores
+	gnotski.2.scores
+	gnotski.20.scores
+	gnotski.21.scores
+	gnotski.22.scores
+	gnotski.23.scores
+	gnotski.24.scores
+	gnotski.25.scores
+	gnotski.26.scores
+	gnotski.27.scores
+	gnotski.28.scores
+	gnotski.29.scores
+	gnotski.3.scores
+	gnotski.30.scores
+	gnotski.31.scores
+	gnotski.32.scores
+	gnotski.33.scores
+	gnotski.34.scores
+	gnotski.35.scores
+	gnotski.36.scores
+	gnotski.37.scores
+	gnotski.4.scores
+	gnotski.5.scores
+	gnotski.6.scores
+	gnotski.7.scores
+	gnotski.8.scores
+	gnotski.9.scores
+	gtali.Colors.scores
+	gtali.Regular.scores
+	mahjongg.bridges.scores
+	mahjongg.cloud.scores
+	mahjongg.confounding.scores
+	mahjongg.difficult.scores
+	mahjongg.dragon.scores
+	mahjongg.easy.scores
+	mahjongg.pyramid.scores
+	mahjongg.tictactoe.scores
+	mahjongg.ziggurat.scores
+	same-gnome.Large.scores
+	same-gnome.Medium.scores
+	same-gnome.Small.scores)
 
 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
+  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 -f -t usr/share/icons/hicolor
 
-  if [ ! -d opt/gnome/var/games ]; then
-    mkdir -p opt/gnome/var/games
-  fi
-
   for score in "${scores[@]}" ; do
-    if [ -e "$score" ]; then
-      chmod 664 "$score"
+    if [ -e "var/games/${score}" ]; then
       continue
     fi
-    touch "$score"
-    chown root:users "$score"
-    chmod 664 "$score"
+    if [ -e "opt/gnome/var/games/${score}" ]; then
+      mv "opt/gnome/var/games/${score}" var/games/
+    else
+      touch "var/games/${score}"
+    fi
+    chown root:games "var/games/${score}"
+    chmod 664 "var/games/${score}"
   done
 }
 
@@ -119,14 +118,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() {
@@ -135,11 +136,8 @@
   gtk-update-icon-cache -q -f -t usr/share/icons/hicolor
 
   for score in "${scores[@]}" ; do
-    rm -f "$score"
+    rm -f "var/games/${score}"
   done
-  if [ -d opt/gnome/var/games ]; then
-    rmdir --ignore-fail-on-non-empty opt/gnome/var/games
-  fi
 }
 
 op=$1




More information about the arch-commits mailing list