From 98bf2ac3fdd6f7bcb6ce45c932fc13c07fecc03f Mon Sep 17 00:00:00 2001 From: root Date: Wed, 25 Apr 2012 00:01:35 +0000 Subject: Wed Apr 25 00:01:35 UTC 2012 --- extra/gnome-games/PKGBUILD | 33 ++++++++------------ extra/gnome-games/gnome-games.install | 59 +++++++++-------------------------- 2 files changed, 27 insertions(+), 65 deletions(-) (limited to 'extra/gnome-games') diff --git a/extra/gnome-games/PKGBUILD b/extra/gnome-games/PKGBUILD index b891651d3..b0ba03dc2 100644 --- a/extra/gnome-games/PKGBUILD +++ b/extra/gnome-games/PKGBUILD @@ -1,44 +1,37 @@ -# $Id: PKGBUILD 148440 2012-01-31 22:33:21Z ibiru $ -# Maintainer: Jan de Groot +# $Id: PKGBUILD 156820 2012-04-23 09:06:47Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot pkgname=gnome-games -pkgver=3.2.1 -pkgrel=2 +pkgver=3.4.1 +pkgrel=1 pkgdesc="Some Games for GNOME" arch=('i686' 'x86_64') license=('GPL') -depends=('libsm' 'gconf' 'desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'python2-gobject' 'dconf') -makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') +depends=('desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'python2-gobject' 'dconf') +makedepends=('yelp-tools' 'intltool' 'gobject-introspection' 'vala') options=('!emptydirs' '!libtool') install=gnome-games.install url="http://www.gnome.org" groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - gnome-sudoku-fix.patch) -sha256sums=('b40fe59537fd58af1bd8163897684883b730ee0f0257d23b493b13e21d105a3b' - '00daafd11078355e16f384fe98dab69ee7e03037c8c311e7180f8f896965a715') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('01726b0631205ccbd9f02938f7ccb1d7bd0c4c001cb4596f871fed7c3afc25d4') build() { - cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/gnome-sudoku-fix.patch" + cd $pkgname-$pkgver PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper \ - --disable-static \ + --localstatedir=/var --disable-static --disable-schemas-compile \ --with-scores-user=root --with-scores-group=games \ --enable-introspection=yes make } package() { - cd "$srcdir/$pkgname-$pkgver" - make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install # Remove all scores, we generate them from postinstall rm -rf "$pkgdir/var" - install -m755 -d "$pkgdir/usr/share/gconf/schemas" - gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-games "$pkgdir"/etc/gconf/schemas/*.schemas - rm -f "$pkgdir"/etc/gconf/schemas/*.schemas - sed -i 's_#! /usr/bin/env python_#!/usr/bin/env python2_' "$pkgdir/usr/bin/gnome-sudoku" } diff --git a/extra/gnome-games/gnome-games.install b/extra/gnome-games/gnome-games.install index 1f67c2e01..aaa36a896 100644 --- a/extra/gnome-games/gnome-games.install +++ b/extra/gnome-games/gnome-games.install @@ -1,5 +1,4 @@ -pkgname=gnome-games -scores=(glines.Large.scores +_scores=(glines.Large.scores glines.Medium.scores glines.Small.scores gnibbles.1.0.scores @@ -88,66 +87,36 @@ scores=(glines.Large.scores quadrapassel.scores) post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - usr/sbin/gconfpkg --install ${pkgname} + glib-compile-schemas usr/share/glib-2.0/schemas update-desktop-database -q gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - for sz in Large Medium Small; do - if [ -e "opt/gnome/var/games/same-gnome.${sz}.scores" ]; then - mv "opt/gnome/var/games/same-gnome.${sz}.scores" \ - "var/games/swell-foop.${sz}.scores" - elif [ -e "var/games/same-gnome.${sz}.scores" ]; then - mv "var/games/same-gnome.${sz}.scores" \ - "var/games/swell-foop.${sz}.scores" - fi - done - if [ -e "opt/gnome/var/games/gnometris.scores" ]; then - mv "opt/gnome/var/games/gnometris.scores" \ - "var/games/quadrapassel.scores" - elif [ -e "var/games/gnometris.scores" ]; then - mv "var/games/gnometris.scores" \ - "var/games/quadrapassel.scores" - fi - - for score in "${scores[@]}" ; do - if [ -e "var/games/${score}" ]; then + for score in "${_scores[@]}" ; do + if [ -e "var/games/$score" ]; then continue fi - 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}" + + touch "var/games/$score" + chown root:games "var/games/$score" + chmod 664 "var/games/$score" done } pre_upgrade() { - pre_remove $1 + (( $(vercmp $2 3.3.5) < 0 )) && gconfpkg --uninstall gnome-games + return 0 } post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} - - if [ -f usr/share/ggz/gnect-client.dsc ]; then - ggz-config -r -m usr/share/ggz/gnect-client.dsc >& /dev/null - ggz-config -r -m usr/share/ggz/gnibbles-client.dsc >& /dev/null - ggz-config -r -m usr/share/ggz/iagno-client.dsc >& /dev/null - fi + post_install } post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas usr/share/glib-2.0/schemas update-desktop-database -q gtk-update-icon-cache -q -f -t usr/share/icons/hicolor - for score in "${scores[@]}" ; do - rm -f "var/games/${score}" + for score in "${_scores[@]}" ; do + rm -f "var/games/$score" done } -- cgit v1.2.3-54-g00ecf