[arch-commits] Commit in gweled/repos (3 files)

[Allan McRae]

    Date: Saturday, October 31, 2009 @ 07:14:56
  Author: allan
Revision: 57046

Merged revisions 356,57045 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/gweled/trunk

........
  r356 | aaron | 2008-04-19 08:56:27 +1000 (Sat, 19 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r57045 | allan | 2009-10-31 21:13:55 +1000 (Sat, 31 Oct 2009) | 2 lines
  
  upgpkg: gweled 0.7-5
      rebuild to get arch in package name
........

Modified:
  gweled/repos/extra-i686/	(properties)
  gweled/repos/extra-i686/PKGBUILD
  gweled/repos/extra-i686/gweled.install

----------------+
 PKGBUILD       |   14 +++++++-------
 gweled.install |   11 +----------
 2 files changed, 8 insertions(+), 17 deletions(-)


Property changes on: gweled/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /gweled/trunk:1
   + /gweled/trunk:1-57045

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-10-31 11:13:55 UTC (rev 57045)
+++ extra-i686/PKGBUILD	2009-10-31 11:14:56 UTC (rev 57046)
@@ -4,26 +4,26 @@
 
 pkgname=gweled
 pkgver=0.7
-pkgrel=4
+pkgrel=5
 pkgdesc="Bejewled Game (aka Diamond Mine)"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
 url="http://sebdelestaing.free.fr/gweled/"
-depends=('libgnomeui>=2.18.1-2' 'librsvg>=2.16' 'libmikmod' 'filesystem>=0.8-3')
+depends=('libgnomeui' 'librsvg' 'libmikmod' 'filesystem')
 install=gweled.install
 source=(http://sebdelestaing.free.fr/gweled/Release/${pkgname}-${pkgver}.tar.gz
         invalid_free.patch)
 md5sums=('730fe1737e0b0e9940575aa573d63d84' '7b467d82e42183c36b25bcf5f9bf4407')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np0 -i ${startdir}/src/invalid_free.patch || return 1
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np0 -i ${srcdir}/invalid_free.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --with-scores-user=root --with-scores-group=games
   make LDFLAGS+=-Wl,--export-dynamic || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR=${pkgdir} install
 
   #We generate these files on postinstall to prevent score resets on upgrade
-#  rm -rf ${startdir}/pkg/var
+  rm -rf ${pkgdir}/var
 }
 

Modified: extra-i686/gweled.install
===================================================================
--- extra-i686/gweled.install	2009-10-31 11:13:55 UTC (rev 57045)
+++ extra-i686/gweled.install	2009-10-31 11:14:56 UTC (rev 57046)
@@ -8,11 +8,7 @@
     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
+    touch "var/games/${score}"
     chown root:games "var/games/${score}"
     chmod 664 "var/games/${score}"
   done
@@ -27,8 +23,3 @@
     rm -f "var/games/$score"
   done
 }
-
-op=$1
-shift
-
-$op $*